diff --git a/Cargo.lock b/Cargo.lock index a71c22586..d8ebc70d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,17 +11,7 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "abstract-domain-derive" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", -] - -[[package]] -name = "abstract-domain-derive" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "proc-macro2 1.0.81", "quote 1.0.36", @@ -221,79 +211,64 @@ checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "aptos-abstract-gas-usage" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-meter 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-gas-algebra", + "aptos-gas-meter", + "aptos-gas-schedule", + "aptos-vm-types", + "move-binary-format", ] [[package]] name = "aptos-accumulator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", -] - -[[package]] -name = "aptos-aggregator" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "bcs 0.1.4", - "claims", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-types", ] [[package]] name = "aptos-aggregator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-logger", + "aptos-types", "bcs 0.1.4", "claims", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-core-types", + "move-vm-types", ] [[package]] name = "aptos-api" version = "0.2.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-api-types", "aptos-bcs-utils", "aptos-build-info", "aptos-config", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-db-indexer", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-global-constants 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-framework", + "aptos-gas-schedule", + "aptos-global-constants", + "aptos-logger", "aptos-mempool", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-metrics-core", + "aptos-runtimes", + "aptos-storage-interface", + "aptos-types", + "aptos-utils", + "aptos-vm", "async-trait", "bcs 0.1.4", "bytes", @@ -304,7 +279,7 @@ dependencies = [ "itertools 0.10.5", "mime", "mini-moka", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-core-types", "num_cpus", "once_cell", "paste", @@ -320,25 +295,25 @@ dependencies = [ [[package]] name = "aptos-api-types" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-config", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-db-indexer", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-framework", + "aptos-logger", "aptos-openapi", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-storage-interface", + "aptos-types", + "aptos-vm", "async-trait", "bcs 0.1.4", "hex", "indoc", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-resource-viewer 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-core-types", + "move-resource-viewer", "once_cell", "poem", "poem-openapi", @@ -350,7 +325,7 @@ dependencies = [ [[package]] name = "aptos-bcs-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "hex", @@ -359,16 +334,7 @@ dependencies = [ [[package]] name = "aptos-bitvec" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "serde", - "serde_bytes", -] - -[[package]] -name = "aptos-bitvec" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "serde", "serde_bytes", @@ -377,54 +343,18 @@ dependencies = [ [[package]] name = "aptos-block-executor" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-drop-helper 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-mvhashmap 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-logging 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "arc-swap", - "bcs 0.1.4", - "bytes", - "claims", - "concurrent-queue", - "crossbeam", - "dashmap", - "derivative", - "fail 0.5.1", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num_cpus", - "once_cell", - "parking_lot 0.12.2", - "rand 0.7.3", - "rayon", - "scopeguard", - "serde", -] - -[[package]] -name = "aptos-block-executor" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-drop-helper 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-mvhashmap 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-vm-logging 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-aggregator", + "aptos-drop-helper", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", + "aptos-mvhashmap", + "aptos-types", + "aptos-vm-logging", + "aptos-vm-types", "arc-swap", "bcs 0.1.4", "bytes", @@ -434,9 +364,9 @@ dependencies = [ "dashmap", "derivative", "fail 0.5.1", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-core-types", + "move-vm-types", "num_cpus", "once_cell", "parking_lot 0.12.2", @@ -449,41 +379,19 @@ dependencies = [ [[package]] name = "aptos-block-partitioner" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "bcs 0.1.4", - "clap 4.5.4", - "dashmap", - "itertools 0.10.5", - "jemallocator", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "rand 0.7.3", - "rayon", - "serde", -] - -[[package]] -name = "aptos-block-partitioner" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-crypto", + "aptos-logger", + "aptos-metrics-core", + "aptos-types", "bcs 0.1.4", "clap 4.5.4", "dashmap", "itertools 0.10.5", "jemallocator", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-core-types", "once_cell", "rand 0.7.3", "rayon", @@ -493,7 +401,7 @@ dependencies = [ [[package]] name = "aptos-bounded-executor" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "futures", "rustversion", @@ -503,7 +411,7 @@ dependencies = [ [[package]] name = "aptos-build-info" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "shadow-rs", ] @@ -511,37 +419,37 @@ dependencies = [ [[package]] name = "aptos-cached-packages" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-framework", "aptos-package-builder", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "bcs 0.1.4", "include_dir 0.7.3", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-core-types", "once_cell", ] [[package]] name = "aptos-channels" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", "futures", ] [[package]] name = "aptos-compression" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-logger", + "aptos-metrics-core", "lz4", "once_cell", "thiserror", @@ -550,17 +458,17 @@ dependencies = [ [[package]] name = "aptos-config" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-global-constants 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-global-constants", + "aptos-logger", "aptos-secure-storage", "aptos-short-hex-str", "aptos-temppath", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "arr_macro", "bcs 0.1.4", "byteorder", @@ -584,17 +492,17 @@ dependencies = [ [[package]] name = "aptos-consensus-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-bitvec 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-bitvec", + "aptos-crypto", + "aptos-crypto-derive", "aptos-executor-types", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", + "aptos-logger", "aptos-short-hex-str", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "bcs 0.1.4", "futures", "itertools 0.10.5", @@ -609,10 +517,10 @@ dependencies = [ [[package]] name = "aptos-crypto" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto-derive", "ark-bn254", "ark-ec", "ark-ff 0.4.2", @@ -652,65 +560,10 @@ dependencies = [ "x25519-dalek", ] -[[package]] -name = "aptos-crypto" -version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "ark-bn254", - "ark-ec", - "ark-ff 0.4.2", - "ark-std 0.4.0", - "base64 0.13.1", - "bcs 0.1.4", - "blst", - "bulletproofs", - "bytes", - "curve25519-dalek", - "curve25519-dalek-ng", - "digest 0.9.0", - "ed25519-dalek", - "hex", - "hkdf 0.10.0", - "libsecp256k1", - "merlin", - "more-asserts", - "num-bigint 0.3.3", - "num-integer", - "once_cell", - "p256", - "poseidon-ark", - "rand 0.7.3", - "rand_core 0.5.1", - "ring 0.16.20", - "serde", - "serde-name", - "serde_bytes", - "sha2 0.10.8", - "sha2 0.9.9", - "signature 2.2.0", - "static_assertions", - "thiserror", - "tiny-keccak", - "x25519-dalek", -] - -[[package]] -name = "aptos-crypto-derive" -version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 1.0.109", -] - [[package]] name = "aptos-crypto-derive" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "proc-macro2 1.0.81", "quote 1.0.36", @@ -720,21 +573,21 @@ dependencies = [ [[package]] name = "aptos-data-client" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "aptos-config", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-id-generator", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", "aptos-netcore", "aptos-network", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-storage-interface", "aptos-storage-service-client", "aptos-storage-service-types", "aptos-time-service", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "arc-swap", "async-trait", "dashmap", @@ -751,28 +604,28 @@ dependencies = [ [[package]] name = "aptos-db" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-accumulator", "aptos-config", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-db-indexer", "aptos-executor", "aptos-executor-types", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-experimental-runtimes", + "aptos-infallible", "aptos-jellyfish-merkle", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-logger", + "aptos-metrics-core", "aptos-proptest-helpers", "aptos-rocksdb-options", "aptos-schemadb", - "aptos-scratchpad 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-scratchpad", + "aptos-storage-interface", "aptos-temppath", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", + "aptos-vm", "arc-swap", "arr_macro", "bcs 0.1.4", @@ -782,9 +635,9 @@ dependencies = [ "either", "itertools 0.10.5", "lru 0.7.8", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-resource-viewer 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num-derive 0.3.3", + "move-core-types", + "move-resource-viewer", + "num-derive", "num_cpus", "once_cell", "proptest", @@ -799,72 +652,39 @@ dependencies = [ [[package]] name = "aptos-db-indexer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-config", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", "aptos-rocksdb-options", "aptos-schemadb", - "aptos-scratchpad 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-scratchpad", + "aptos-storage-interface", + "aptos-types", + "aptos-vm", "bcs 0.1.4", "byteorder", "bytes", "dashmap", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-resource-viewer 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num-derive 0.3.3", - "serde", -] - -[[package]] -name = "aptos-dkg" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "bcs 0.1.4", - "bellman", - "blst", - "blstrs", - "criterion", - "ff 0.13.0", - "group 0.13.0", - "hex", - "merlin", - "more-asserts", - "num-bigint 0.3.3", - "num-integer", - "num-traits", - "once_cell", - "pairing", - "rand 0.7.3", - "rand_core 0.5.1", - "rayon", + "move-core-types", + "move-resource-viewer", + "num-derive", "serde", - "serde_bytes", - "sha3", - "static_assertions", ] [[package]] name = "aptos-dkg" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-runtimes", "bcs 0.1.4", "bellman", "blst", @@ -892,23 +712,11 @@ dependencies = [ [[package]] name = "aptos-drop-helper" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "threadpool", -] - -[[package]] -name = "aptos-drop-helper" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-experimental-runtimes", + "aptos-infallible", + "aptos-metrics-core", "once_cell", "threadpool", ] @@ -916,14 +724,14 @@ dependencies = [ [[package]] name = "aptos-event-notifications" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-channels", "aptos-id-generator", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", + "aptos-storage-interface", + "aptos-types", "async-trait", "futures", "serde", @@ -933,31 +741,31 @@ dependencies = [ [[package]] name = "aptos-executor" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-block-partitioner 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-block-partitioner", "aptos-consensus-types", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-drop-helper 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-drop-helper", "aptos-executor-service", "aptos-executor-types", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-scratchpad 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-secure-net 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-experimental-runtimes", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", + "aptos-scratchpad", + "aptos-secure-net", + "aptos-storage-interface", + "aptos-types", + "aptos-vm", "arr_macro", "bcs 0.1.4", "bytes", "dashmap", "fail 0.5.1", "itertools 0.10.5", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-core-types", "num_cpus", "once_cell", "rayon", @@ -967,24 +775,24 @@ dependencies = [ [[package]] name = "aptos-executor-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-block-partitioner 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-block-partitioner", "aptos-config", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-executor-types", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", "aptos-language-e2e-tests", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-logger", + "aptos-metrics-core", "aptos-node-resource-metrics", "aptos-push-metrics", - "aptos-retrier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-secure-net 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-retrier", + "aptos-secure-net", + "aptos-storage-interface", + "aptos-types", + "aptos-vm", "bcs 0.1.4", "clap 4.5.4", "crossbeam-channel", @@ -1004,22 +812,22 @@ dependencies = [ [[package]] name = "aptos-executor-test-helpers" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-cached-packages", "aptos-config", "aptos-consensus-types", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-db", "aptos-executor", "aptos-executor-types", "aptos-genesis", "aptos-sdk", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-storage-interface", "aptos-temppath", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", + "aptos-vm", "aptos-vm-genesis", "rand 0.7.3", ] @@ -1027,16 +835,16 @@ dependencies = [ [[package]] name = "aptos-executor-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-block-partitioner 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-drop-helper 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-scratchpad 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-secure-net 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-block-partitioner", + "aptos-crypto", + "aptos-drop-helper", + "aptos-scratchpad", + "aptos-secure-net", + "aptos-storage-interface", + "aptos-types", "bcs 0.1.4", "criterion", "dashmap", @@ -1049,23 +857,9 @@ dependencies = [ [[package]] name = "aptos-experimental-runtimes" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "aptos-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "core_affinity", - "libc", - "num_cpus", - "once_cell", - "rayon", - "tokio", -] - -[[package]] -name = "aptos-experimental-runtimes" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-runtimes", "core_affinity", "libc", "num_cpus", @@ -1077,13 +871,13 @@ dependencies = [ [[package]] name = "aptos-faucet-core" version = "2.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-config", "aptos-faucet-metrics-server", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-logger", + "aptos-metrics-core", "aptos-sdk", "async-trait", "captcha", @@ -1111,11 +905,11 @@ dependencies = [ [[package]] name = "aptos-faucet-metrics-server" version = "2.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-logger", + "aptos-metrics-core", "once_cell", "poem", "prometheus", @@ -1126,94 +920,19 @@ dependencies = [ [[package]] name = "aptos-framework" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-move-stdlib 0.1.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-native-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-sdk-builder 0.2.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-table-natives 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "ark-bls12-381", - "ark-bn254", - "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "base64 0.13.1", - "bcs 0.1.4", - "better_any", - "blake2-rfc", - "blst", - "bulletproofs", - "byteorder", - "clap 4.5.4", - "codespan-reporting", - "curve25519-dalek-ng", - "either", - "flate2", - "hex", - "include_dir 0.7.3", - "itertools 0.10.5", - "libsecp256k1", - "log", - "lru 0.7.8", - "merlin", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-cli 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-package 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-prover 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-prover-boogie-backend 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-prover-bytecode-pipeline 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-stackless-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num-traits", - "once_cell", - "rand 0.7.3", - "rand_core 0.5.1", - "rayon", - "ripemd", - "serde", - "serde_bytes", - "serde_json", - "serde_yaml 0.8.26", - "sha2 0.10.8", - "sha2 0.9.9", - "sha3", - "siphasher", - "smallvec", - "tempfile", - "thiserror", - "tiny-keccak", -] - -[[package]] -name = "aptos-framework" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-move-stdlib 0.1.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-native-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-sdk-builder 0.2.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-table-natives 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-aggregator", + "aptos-crypto", + "aptos-gas-algebra", + "aptos-gas-schedule", + "aptos-move-stdlib", + "aptos-native-interface", + "aptos-sdk-builder", + "aptos-table-natives", + "aptos-types", + "aptos-vm-types", "ark-bls12-381", "ark-bn254", "ark-ec", @@ -1239,20 +958,20 @@ dependencies = [ "log", "lru 0.7.8", "merlin", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-cli 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-package 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-prover 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-prover-boogie-backend 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-prover-bytecode-pipeline 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-stackless-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-cli", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-docgen", + "move-model", + "move-package", + "move-prover", + "move-prover-boogie-backend", + "move-prover-bytecode-pipeline", + "move-stackless-bytecode", + "move-vm-runtime", + "move-vm-types", "num-traits", "once_cell", "rand 0.7.3", @@ -1276,71 +995,46 @@ dependencies = [ [[package]] name = "aptos-gas-algebra" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "either", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", -] - -[[package]] -name = "aptos-gas-algebra" -version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "either", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", -] - -[[package]] -name = "aptos-gas-meter" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "bcs 0.1.4", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-core-types", ] [[package]] name = "aptos-gas-meter" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-gas-algebra", + "aptos-gas-schedule", + "aptos-logger", + "aptos-types", + "aptos-vm-types", "bcs 0.1.4", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-core-types", + "move-vm-types", ] [[package]] name = "aptos-gas-profiling" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-meter 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-framework", + "aptos-gas-algebra", + "aptos-gas-meter", "aptos-package-builder", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", + "aptos-vm-types", "bcs 0.1.4", "handlebars", "inferno", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-core-types", + "move-vm-types", "regex", "serde_json", "smallvec", @@ -1349,29 +1043,14 @@ dependencies = [ [[package]] name = "aptos-gas-schedule" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-global-constants 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "either", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "paste", - "rand 0.7.3", -] - -[[package]] -name = "aptos-gas-schedule" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-global-constants 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-gas-algebra", + "aptos-global-constants", + "aptos-types", "either", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-core-types", + "move-vm-types", "paste", "rand 0.7.3", ] @@ -1379,21 +1058,21 @@ dependencies = [ [[package]] name = "aptos-genesis" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-cached-packages", "aptos-config", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-db", "aptos-executor", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-framework", "aptos-keygen", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-logger", + "aptos-storage-interface", "aptos-temppath", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", + "aptos-vm", "aptos-vm-genesis", "bcs 0.1.4", "rand 0.7.3", @@ -1404,47 +1083,37 @@ dependencies = [ [[package]] name = "aptos-global-constants" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" - -[[package]] -name = "aptos-global-constants" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" [[package]] name = "aptos-id-generator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" - -[[package]] -name = "aptos-infallible" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" [[package]] name = "aptos-infallible" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" [[package]] name = "aptos-jellyfish-merkle" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-experimental-runtimes", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", + "aptos-storage-interface", + "aptos-types", "arr_macro", "bcs 0.1.4", "byteorder", "itertools 0.10.5", - "num-derive 0.3.3", + "num-derive", "num-traits", "once_cell", "proptest", @@ -1457,50 +1126,50 @@ dependencies = [ [[package]] name = "aptos-keygen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-types", "rand 0.7.3", ] [[package]] name = "aptos-language-e2e-tests" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-abstract-gas-usage", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-bitvec 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-block-executor 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-aggregator", + "aptos-bitvec", + "aptos-block-executor", "aptos-cached-packages", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-meter 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-framework", + "aptos-gas-algebra", + "aptos-gas-meter", "aptos-gas-profiling", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-gas-schedule", "aptos-keygen", - "aptos-memory-usage-tracker 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-native-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-memory-usage-tracker", + "aptos-native-interface", "aptos-proptest-helpers", "aptos-temppath", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", + "aptos-vm", "aptos-vm-genesis", - "aptos-vm-logging 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-vm-logging", + "aptos-vm-types", "bcs 0.1.4", "bytes", "goldenfile", "hex", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-command-line-common", + "move-core-types", "move-ir-compiler", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-model", + "move-vm-types", "num_cpus", "once_cell", "petgraph 0.5.1", @@ -1514,10 +1183,10 @@ dependencies = [ [[package]] name = "aptos-ledger" version = "0.2.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-types", "hex", "ledger-apdu", "ledger-transport-hid", @@ -1528,17 +1197,7 @@ dependencies = [ [[package]] name = "aptos-log-derive" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "aptos-log-derive" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "proc-macro2 1.0.81", "quote 1.0.36", @@ -1548,10 +1207,10 @@ dependencies = [ [[package]] name = "aptos-logger" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-log-derive 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", + "aptos-log-derive", "backtrace", "chrono", "erased-serde", @@ -1566,81 +1225,43 @@ dependencies = [ "tracing-subscriber 0.3.18", ] -[[package]] -name = "aptos-logger" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-log-derive 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-node-identity", - "backtrace", - "chrono", - "erased-serde", - "futures", - "hostname", - "once_cell", - "prometheus", - "serde", - "serde_json", - "strum 0.24.1", - "strum_macros 0.24.3", - "tokio", - "tracing", - "tracing-subscriber 0.3.18", -] - -[[package]] -name = "aptos-memory-usage-tracker" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-meter 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", -] - [[package]] name = "aptos-memory-usage-tracker" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-gas-meter 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-gas-algebra", + "aptos-gas-meter", + "aptos-types", + "aptos-vm-types", + "move-binary-format", + "move-core-types", + "move-vm-types", ] [[package]] name = "aptos-mempool" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-bounded-executor", "aptos-channels", "aptos-config", "aptos-consensus-types", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-data-client", "aptos-event-notifications", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", + "aptos-logger", "aptos-mempool-notifications", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-metrics-core", "aptos-netcore", "aptos-network", - "aptos-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-runtimes", "aptos-short-hex-str", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-storage-interface", + "aptos-types", "aptos-vm-validator", "async-trait", "bcs 0.1.4", @@ -1661,10 +1282,10 @@ dependencies = [ [[package]] name = "aptos-mempool-notifications" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-runtimes", + "aptos-types", "async-trait", "futures", "serde", @@ -1675,9 +1296,9 @@ dependencies = [ [[package]] name = "aptos-memsocket" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", "bytes", "futures", "once_cell", @@ -1686,16 +1307,7 @@ dependencies = [ [[package]] name = "aptos-metrics-core" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "prometheus", -] - -[[package]] -name = "aptos-metrics-core" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "prometheus", @@ -1704,49 +1316,23 @@ dependencies = [ [[package]] name = "aptos-move-stdlib" version = "0.1.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-native-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "either", - "hex", - "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-errmapgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-prover 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "sha2 0.9.9", - "sha3", - "smallvec", - "walkdir", -] - -[[package]] -name = "aptos-move-stdlib" -version = "0.1.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-native-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-gas-schedule", + "aptos-native-interface", "either", "hex", "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-errmapgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-prover 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-docgen", + "move-errmapgen", + "move-prover", + "move-vm-runtime", + "move-vm-types", "sha2 0.9.9", "sha3", "smallvec", @@ -1756,91 +1342,51 @@ dependencies = [ [[package]] name = "aptos-mvhashmap" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-aggregator", + "aptos-crypto", + "aptos-infallible", + "aptos-types", + "aptos-vm-types", "bcs 0.1.4", "bytes", "claims", "crossbeam", "dashmap", "derivative", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-core-types", + "move-vm-types", "serde", ] -[[package]] -name = "aptos-mvhashmap" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "bcs 0.1.4", - "bytes", - "claims", - "crossbeam", - "dashmap", - "derivative", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "serde", -] - -[[package]] -name = "aptos-native-interface" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "bcs 0.1.4", - "bytes", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "smallvec", -] - [[package]] name = "aptos-native-interface" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-gas-algebra", + "aptos-gas-schedule", + "aptos-types", "bcs 0.1.4", "bytes", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-core-types", + "move-vm-runtime", + "move-vm-types", "smallvec", ] [[package]] name = "aptos-netcore" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "aptos-memsocket", "aptos-proxy", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "bytes", "futures", "pin-project", @@ -1853,26 +1399,26 @@ dependencies = [ [[package]] name = "aptos-network" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-bitvec 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-bitvec", "aptos-channels", "aptos-compression", "aptos-config", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-crypto-derive", "aptos-id-generator", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", "aptos-netcore", "aptos-num-variants", "aptos-peer-monitoring-service-types", "aptos-rate-limiter", "aptos-short-hex-str", "aptos-time-service", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "arc-swap", "async-trait", "bcs 0.1.4", @@ -1898,27 +1444,15 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "aptos-node-identity" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "claims", - "hostname", - "once_cell", -] - [[package]] name = "aptos-node-resource-metrics" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "aptos-build-info", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", "cfg-if", "once_cell", "procfs", @@ -1929,7 +1463,7 @@ dependencies = [ [[package]] name = "aptos-num-variants" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "proc-macro2 1.0.81", "quote 1.0.36", @@ -1939,7 +1473,7 @@ dependencies = [ [[package]] name = "aptos-openapi" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "async-trait", "percent-encoding", @@ -1952,23 +1486,23 @@ dependencies = [ [[package]] name = "aptos-package-builder" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-framework", "itertools 0.10.5", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-package 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-command-line-common", + "move-package", "tempfile", ] [[package]] name = "aptos-peer-monitoring-service-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "aptos-config", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "bcs 0.1.4", "cfg_block", "serde", @@ -1978,7 +1512,7 @@ dependencies = [ [[package]] name = "aptos-proptest-helpers" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "crossbeam", "proptest", @@ -1988,20 +1522,7 @@ dependencies = [ [[package]] name = "aptos-protos" version = "1.3.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "futures-core", - "pbjson", - "prost", - "prost-types", - "serde", - "tonic", -] - -[[package]] -name = "aptos-protos" -version = "1.3.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "futures-core", "pbjson", @@ -2014,7 +1535,7 @@ dependencies = [ [[package]] name = "aptos-proxy" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "ipnet", ] @@ -2022,10 +1543,10 @@ dependencies = [ [[package]] name = "aptos-push-metrics" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-logger", + "aptos-metrics-core", "ureq", "url", ] @@ -2033,11 +1554,11 @@ dependencies = [ [[package]] name = "aptos-rate-limiter" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", "futures", "pin-project", "tokio", @@ -2047,20 +1568,20 @@ dependencies = [ [[package]] name = "aptos-rest-client" version = "0.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-api-types", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-infallible", + "aptos-logger", + "aptos-types", "bcs 0.1.4", "bytes", "futures", "hex", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-core-types", "poem-openapi", "reqwest", "serde", @@ -2073,25 +1594,16 @@ dependencies = [ [[package]] name = "aptos-retrier" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "tokio", -] - -[[package]] -name = "aptos-retrier" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-logger", "tokio", ] [[package]] name = "aptos-rocksdb-options" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "aptos-config", "rocksdb", @@ -2100,16 +1612,7 @@ dependencies = [ [[package]] name = "aptos-runtimes" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "rayon", - "tokio", -] - -[[package]] -name = "aptos-runtimes" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "rayon", "tokio", @@ -2118,13 +1621,13 @@ dependencies = [ [[package]] name = "aptos-schemadb" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", + "aptos-storage-interface", "dunce", "once_cell", "proptest", @@ -2135,15 +1638,15 @@ dependencies = [ [[package]] name = "aptos-scratchpad" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-drop-helper 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" +dependencies = [ + "aptos-crypto", + "aptos-drop-helper", + "aptos-experimental-runtimes", + "aptos-infallible", + "aptos-logger", + "aptos-metrics-core", + "aptos-types", "bitvec 1.0.1", "itertools 0.10.5", "once_cell", @@ -2152,41 +1655,22 @@ dependencies = [ "thiserror", ] -[[package]] -name = "aptos-scratchpad" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-drop-helper 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "bitvec 1.0.1", - "itertools 0.10.5", - "once_cell", - "rayon", - "thiserror", -] - [[package]] name = "aptos-sdk" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-api-types", "aptos-cached-packages", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-global-constants 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-global-constants", "aptos-ledger", "aptos-rest-client", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "bcs 0.1.4", "ed25519-dalek-bip32", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-core-types", "rand_core 0.5.1", "serde", "tiny-bip39", @@ -2195,33 +1679,14 @@ dependencies = [ [[package]] name = "aptos-sdk-builder" version = "0.2.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "bcs 0.1.4", - "clap 4.5.4", - "heck 0.4.1", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "regex", - "serde-generate", - "serde-reflection", - "serde_yaml 0.8.26", - "textwrap 0.15.2", -] - -[[package]] -name = "aptos-sdk-builder" -version = "0.2.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-types", "bcs 0.1.4", "clap 4.5.4", "heck 0.4.1", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-core-types", "once_cell", "regex", "serde-generate", @@ -2233,31 +1698,12 @@ dependencies = [ [[package]] name = "aptos-secure-net" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-retrier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "bcs 0.1.4", - "crossbeam-channel", - "once_cell", - "serde", - "thiserror", - "tokio", - "tonic", - "tonic-reflection", -] - -[[package]] -name = "aptos-secure-net" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-retrier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-logger", + "aptos-metrics-core", + "aptos-protos", + "aptos-retrier", "bcs 0.1.4", "crossbeam-channel", "once_cell", @@ -2271,12 +1717,12 @@ dependencies = [ [[package]] name = "aptos-secure-storage" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", + "aptos-infallible", + "aptos-logger", "aptos-temppath", "aptos-time-service", "aptos-vault-client", @@ -2293,7 +1739,7 @@ dependencies = [ [[package]] name = "aptos-short-hex-str" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "mirai-annotations", "serde", @@ -2304,22 +1750,10 @@ dependencies = [ [[package]] name = "aptos-speculative-state-helper" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "crossbeam", - "once_cell", - "rayon", -] - -[[package]] -name = "aptos-speculative-state-helper" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-infallible", "crossbeam", "once_cell", "rayon", @@ -2328,56 +1762,24 @@ dependencies = [ [[package]] name = "aptos-storage-interface" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-scratchpad 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-secure-net 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "arr_macro", - "bcs 0.1.4", - "bytes", - "crossbeam-channel", - "dashmap", - "itertools 0.10.5", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "parking_lot 0.12.2", - "proptest", - "proptest-derive 0.4.0", - "rayon", - "rocksdb", - "serde", - "thiserror", - "threadpool", -] - -[[package]] -name = "aptos-storage-interface" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-scratchpad 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-secure-net 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-crypto", + "aptos-experimental-runtimes", + "aptos-logger", + "aptos-metrics-core", + "aptos-scratchpad", + "aptos-secure-net", + "aptos-types", + "aptos-vm", "arr_macro", "bcs 0.1.4", "bytes", "crossbeam-channel", "dashmap", "itertools 0.10.5", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-core-types", "once_cell", "parking_lot 0.12.2", "proptest", @@ -2392,13 +1794,13 @@ dependencies = [ [[package]] name = "aptos-storage-service-client" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "aptos-channels", "aptos-config", "aptos-network", "aptos-storage-service-types", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "async-trait", "thiserror", ] @@ -2406,13 +1808,13 @@ dependencies = [ [[package]] name = "aptos-storage-service-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "aptos-compression", "aptos-config", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-time-service", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "bcs 0.1.4", "num-traits", "serde", @@ -2422,41 +1824,20 @@ dependencies = [ [[package]] name = "aptos-table-natives" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-native-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "better_any", - "bytes", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-table-extension 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-test-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "sha3", - "smallvec", -] - -[[package]] -name = "aptos-table-natives" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-native-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-gas-schedule", + "aptos-native-interface", + "aptos-types", "better_any", "bytes", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-table-extension 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-test-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-core-types", + "move-table-extension", + "move-vm-runtime", + "move-vm-test-utils", + "move-vm-types", "sha3", "smallvec", ] @@ -2464,7 +1845,7 @@ dependencies = [ [[package]] name = "aptos-temppath" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "hex", "rand 0.7.3", @@ -2473,9 +1854,9 @@ dependencies = [ [[package]] name = "aptos-time-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-infallible", "enum_dispatch", "futures", "pin-project", @@ -2486,14 +1867,14 @@ dependencies = [ [[package]] name = "aptos-types" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-bitvec 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-dkg 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-bitvec", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-dkg", + "aptos-experimental-runtimes", "ark-bn254", "ark-ff 0.4.2", "ark-groth16", @@ -2508,12 +1889,12 @@ dependencies = [ "hex", "itertools 0.10.5", "jsonwebtoken", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-table-extension 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-core-types", + "move-table-extension", + "move-vm-types", "num-bigint 0.3.3", - "num-derive 0.3.3", + "num-derive", "num-traits", "once_cell", "passkey-types", @@ -2534,72 +1915,17 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "aptos-types" -version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "aptos-bitvec 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-dkg 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "ark-bn254", - "ark-ff 0.4.2", - "ark-groth16", - "ark-serialize 0.4.2", - "arr_macro", - "base64 0.13.1", - "bcs 0.1.4", - "bytes", - "chrono", - "derivative", - "fixed", - "hex", - "itertools 0.10.5", - "jsonwebtoken", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-table-extension 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "num-bigint 0.3.3", - "num-derive 0.3.3", - "num-traits", - "once_cell", - "passkey-types", - "rand 0.7.3", - "rayon", - "ring 0.16.20", - "rsa", - "serde", - "serde-big-array", - "serde_bytes", - "serde_json", - "serde_with", - "serde_yaml 0.8.26", - "strum 0.24.1", - "strum_macros 0.24.3", - "thiserror", - "tiny-keccak", -] - -[[package]] -name = "aptos-utils" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" - [[package]] name = "aptos-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" [[package]] name = "aptos-vault-client" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "base64 0.13.1", "chrono", "native-tls", @@ -2613,32 +1939,32 @@ dependencies = [ [[package]] name = "aptos-vm" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-bitvec 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-block-executor 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-block-partitioner 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-meter 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-memory-usage-tracker 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-move-stdlib 0.1.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-mvhashmap 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-native-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-table-natives 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-logging 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" +dependencies = [ + "anyhow", + "aptos-aggregator", + "aptos-bitvec", + "aptos-block-executor", + "aptos-block-partitioner", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-experimental-runtimes", + "aptos-framework", + "aptos-gas-algebra", + "aptos-gas-meter", + "aptos-gas-schedule", + "aptos-infallible", + "aptos-logger", + "aptos-memory-usage-tracker", + "aptos-metrics-core", + "aptos-move-stdlib", + "aptos-mvhashmap", + "aptos-native-interface", + "aptos-table-natives", + "aptos-types", + "aptos-utils", + "aptos-vm-logging", + "aptos-vm-types", "base64-url", "bcs 0.1.4", "bytes", @@ -2650,12 +1976,12 @@ dependencies = [ "futures", "hex", "jsonwebtoken", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-bytecode-utils", + "move-bytecode-verifier", + "move-core-types", + "move-vm-runtime", + "move-vm-types", "num_cpus", "once_cell", "ouroboros 0.15.6", @@ -2668,109 +1994,37 @@ dependencies = [ ] [[package]] -name = "aptos-vm" +name = "aptos-vm-genesis" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-bitvec 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-block-executor 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-block-partitioner 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-crypto-derive 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-experimental-runtimes 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-gas-meter 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-infallible 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-memory-usage-tracker 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-move-stdlib 0.1.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-mvhashmap 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-native-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-table-natives 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-vm-logging 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "base64-url", + "aptos-cached-packages", + "aptos-crypto", + "aptos-framework", + "aptos-gas-schedule", + "aptos-types", + "aptos-vm", + "aptos-vm-types", "bcs 0.1.4", "bytes", - "claims", - "crossbeam-channel", - "dashmap", - "derive_more", - "fail 0.5.1", - "futures", - "hex", - "jsonwebtoken", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "num_cpus", + "move-core-types", + "move-vm-types", "once_cell", - "ouroboros 0.15.6", "rand 0.7.3", - "rayon", "serde", - "serde_json", - "smallvec", - "tracing", ] [[package]] -name = "aptos-vm-genesis" +name = "aptos-vm-logging" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "anyhow", - "aptos-cached-packages", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "bcs 0.1.4", - "bytes", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "aptos-vm-logging" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-speculative-state-helper 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "arc-swap", - "once_cell", - "serde", -] - -[[package]] -name = "aptos-vm-logging" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-metrics-core 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-speculative-state-helper 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "aptos-crypto", + "aptos-logger", + "aptos-metrics-core", + "aptos-speculative-state-helper", + "aptos-types", "arc-swap", "once_cell", "serde", @@ -2779,41 +2033,20 @@ dependencies = [ [[package]] name = "aptos-vm-types" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-aggregator", + "aptos-gas-algebra", + "aptos-gas-schedule", + "aptos-types", "bcs 0.1.4", "bytes", "claims", "either", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "aptos-vm-types" -version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "aptos-aggregator 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-gas-algebra 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-gas-schedule 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "bcs 0.1.4", - "bytes", - "claims", - "either", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-core-types", + "move-vm-types", "rand 0.7.3", "serde", ] @@ -2821,15 +2054,15 @@ dependencies = [ [[package]] name = "aptos-vm-validator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "aptos-event-notifications", - "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-logging 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-logger", + "aptos-storage-interface", + "aptos-types", + "aptos-vm", + "aptos-vm-logging", "fail 0.5.1", ] @@ -3232,15 +2465,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" -[[package]] -name = "autotools" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf" -dependencies = [ - "cc", -] - [[package]] name = "axum" version = "0.6.20" @@ -3606,18 +2830,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "bonsai-sdk" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0f26687ed447c77b1a40a3665bf88e8327b6de65a74f521544bd225982f589" -dependencies = [ - "reqwest", - "risc0-groth16", - "serde", - "thiserror", -] - [[package]] name = "borsh" version = "0.10.3" @@ -3764,20 +2976,6 @@ name = "bytemuck" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" -dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", -] [[package]] name = "byteorder" @@ -3856,20 +3054,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "cargo_metadata" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" -dependencies = [ - "camino", - "cargo-platform", - "semver 1.0.22", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "cassowary" version = "0.3.0" @@ -3957,7 +3141,7 @@ checksum = "b8f7d49c1ececa30a4587c5fe8a4035b786b78a3253ed0f9636de591b3dc2b37" dependencies = [ "bytes", "flex-error", - "num-derive 0.3.3", + "num-derive", "num-traits", "prost", "prost-types", @@ -4977,18 +4161,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -[[package]] -name = "docker-generate" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf673e0848ef09fa4aeeba78e681cf651c0c7d35f76ee38cec8e55bc32fa111" - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - [[package]] name = "dunce" version = "1.0.4" @@ -5081,12 +4253,6 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" -[[package]] -name = "elf" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b" - [[package]] name = "elliptic-curve" version = "0.13.8" @@ -5701,17 +4867,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "guest" -version = "0.1.0" -dependencies = [ - "aptos-block-executor 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "risc0-zkvm", - "tempfile", -] - [[package]] name = "h2" version = "0.3.26" @@ -5929,18 +5084,6 @@ dependencies = [ "hmac 0.8.1", ] -[[package]] -name = "host" -version = "0.0.0" -dependencies = [ - "anyhow", - "methods", - "risc0-zkvm", - "serde", - "tempfile", - "tracing-subscriber 0.3.18", -] - [[package]] name = "hostname" version = "0.3.1" @@ -7033,13 +6176,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "methods" -version = "0.1.0" -dependencies = [ - "risc0-build", -] - [[package]] name = "mime" version = "0.3.17" @@ -7122,9 +6258,9 @@ name = "monza-execution-util" version = "0.3.0" dependencies = [ "anyhow", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-sdk", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", "m1-da-light-node-util", "rand 0.7.3", "serde_json", @@ -7138,26 +6274,27 @@ dependencies = [ "anyhow", "aptos-api", "aptos-api-types", - "aptos-bitvec 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-block-executor 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-bitvec", + "aptos-block-executor", "aptos-config", "aptos-consensus-types", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-db", "aptos-executor", "aptos-executor-test-helpers", "aptos-executor-types", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-framework", "aptos-language-e2e-tests", "aptos-mempool", + "aptos-proptest-helpers", "aptos-sdk", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-storage-interface", "aptos-temppath", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", + "aptos-vm", "aptos-vm-genesis", - "aptos-vm-logging 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-vm-logging", + "aptos-vm-types", "async-channel", "async-trait", "bcs 0.1.4", @@ -7194,26 +6331,26 @@ dependencies = [ "anyhow", "aptos-api", "aptos-api-types", - "aptos-bitvec 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-block-executor 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-bitvec", + "aptos-block-executor", "aptos-config", "aptos-consensus-types", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-db", "aptos-executor", "aptos-executor-test-helpers", "aptos-executor-types", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-framework", "aptos-language-e2e-tests", "aptos-mempool", "aptos-sdk", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-storage-interface", "aptos-temppath", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", + "aptos-vm", "aptos-vm-genesis", - "aptos-vm-logging 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-vm-logging", + "aptos-vm-types", "async-trait", "borsh", "bytes", @@ -7263,28 +6400,28 @@ dependencies = [ "anyhow", "aptos-api", "aptos-api-types", - "aptos-bitvec 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-block-executor 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-bitvec", + "aptos-block-executor", "aptos-cached-packages", "aptos-config", "aptos-consensus-types", - "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-crypto", "aptos-db", "aptos-executor", "aptos-executor-test-helpers", "aptos-executor-types", "aptos-faucet-core", - "aptos-framework 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-framework", "aptos-language-e2e-tests", "aptos-mempool", "aptos-sdk", - "aptos-storage-interface 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-storage-interface", "aptos-temppath", - "aptos-types 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-types", + "aptos-vm", "aptos-vm-genesis", - "aptos-vm-logging 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "aptos-vm-types 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "aptos-vm-logging", + "aptos-vm-types", "async-channel", "async-trait", "bcs 0.1.4", @@ -7324,61 +6461,29 @@ checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" [[package]] name = "move-abigen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bcs 0.1.4", "heck 0.3.3", "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "serde", -] - -[[package]] -name = "move-abigen" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "bcs 0.1.4", - "heck 0.3.3", - "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-bytecode-verifier", + "move-command-line-common", + "move-core-types", + "move-model", "serde", ] [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "backtrace", "indexmap 1.9.3", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "ref-cast", - "serde", - "variant_count", -] - -[[package]] -name = "move-binary-format" -version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "backtrace", - "indexmap 1.9.3", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-core-types", "once_cell", "ref-cast", "serde", @@ -7388,63 +6493,31 @@ dependencies = [ [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" - -[[package]] -name = "move-borrow-graph" -version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" - -[[package]] -name = "move-bytecode-source-map" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "bcs 0.1.4", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "serde", -] +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bcs 0.1.4", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-command-line-common", + "move-core-types", + "move-ir-types", + "move-symbol-pool", "serde", ] [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "petgraph 0.5.1", - "serde-reflection", -] - -[[package]] -name = "move-bytecode-utils" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-core-types", "petgraph 0.5.1", "serde-reflection", ] @@ -7452,63 +6525,31 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "fail 0.4.0", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-borrow-graph 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-borrow-graph", + "move-core-types", "petgraph 0.5.1", "serde", "typed-arena", ] -[[package]] -name = "move-bytecode-verifier" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "fail 0.4.0", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-borrow-graph 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "petgraph 0.5.1", - "serde", - "typed-arena", -] - -[[package]] -name = "move-bytecode-viewer" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "clap 4.5.4", - "crossterm 0.26.1", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-disassembler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "regex", - "tui", -] - [[package]] name = "move-bytecode-viewer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "clap 4.5.4", "crossterm 0.26.1", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-disassembler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-bytecode-source-map", + "move-command-line-common", + "move-disassembler", + "move-ir-types", "regex", "tui", ] @@ -7516,7 +6557,7 @@ dependencies = [ [[package]] name = "move-cli" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bcs 0.1.4", @@ -7526,29 +6567,29 @@ dependencies = [ "colored", "difference", "itertools 0.10.5", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-viewer 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-coverage 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-disassembler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-errmapgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-package 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-prover 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-resource-viewer 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-stdlib 0.1.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-unit-test 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-test-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-bytecode-source-map", + "move-bytecode-utils", + "move-bytecode-verifier", + "move-bytecode-viewer", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-coverage", + "move-disassembler", + "move-docgen", + "move-errmapgen", + "move-ir-types", + "move-model", + "move-package", + "move-prover", + "move-resource-viewer", + "move-stdlib", + "move-symbol-pool", + "move-unit-test", + "move-vm-runtime", + "move-vm-test-utils", + "move-vm-types", "once_cell", "reqwest", "serde", @@ -7559,79 +6600,16 @@ dependencies = [ "walkdir", ] -[[package]] -name = "move-cli" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "bcs 0.1.4", - "bytes", - "clap 4.5.4", - "codespan-reporting", - "colored", - "difference", - "itertools 0.10.5", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-viewer 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-coverage 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-disassembler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-errmapgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-package 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-prover 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-resource-viewer 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-stdlib 0.1.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-unit-test 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-test-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "once_cell", - "reqwest", - "serde", - "serde_json", - "serde_yaml 0.8.26", - "tempfile", - "toml_edit 0.14.4", - "walkdir", -] - -[[package]] -name = "move-command-line-common" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "difference", - "dirs-next", - "hex", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num-bigint 0.4.4", - "once_cell", - "serde", - "sha2 0.9.9", - "walkdir", -] - [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "difference", "dirs-next", "hex", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-core-types", "num-bigint 0.4.4", "once_cell", "serde", @@ -7642,7 +6620,7 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bcs 0.1.4", @@ -7650,44 +6628,15 @@ dependencies = [ "codespan-reporting", "difference", "hex", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-borrow-graph 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-to-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num-bigint 0.4.4", - "once_cell", - "petgraph 0.5.1", - "regex", - "sha3", - "tempfile", - "walkdir", -] - -[[package]] -name = "move-compiler" -version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "bcs 0.1.4", - "clap 4.5.4", - "codespan-reporting", - "difference", - "hex", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-borrow-graph 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-to-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-borrow-graph", + "move-bytecode-source-map", + "move-bytecode-verifier", + "move-command-line-common", + "move-core-types", + "move-ir-to-bytecode", + "move-ir-types", + "move-symbol-pool", "num-bigint 0.4.4", "once_cell", "petgraph 0.5.1", @@ -7700,9 +6649,9 @@ dependencies = [ [[package]] name = "move-compiler-v2" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "abstract-domain-derive 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "abstract-domain-derive", "anyhow", "bcs 0.1.4", "clap 4.5.4", @@ -7714,49 +6663,16 @@ dependencies = [ "itertools 0.10.5", "lazy_static", "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-disassembler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-stackless-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num", - "once_cell", - "petgraph 0.6.4", - "serde", -] - -[[package]] -name = "move-compiler-v2" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "abstract-domain-derive 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "anyhow", - "bcs 0.1.4", - "clap 4.5.4", - "codespan", - "codespan-reporting", - "ethnum", - "flexi_logger", - "im", - "itertools 0.10.5", - "lazy_static", - "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-disassembler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-stackless-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-bytecode-source-map", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-disassembler", + "move-ir-types", + "move-model", + "move-stackless-bytecode", + "move-symbol-pool", "num", "once_cell", "petgraph 0.6.4", @@ -7766,7 +6682,7 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.4" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "arbitrary", @@ -7788,223 +6704,111 @@ dependencies = [ "uint", ] -[[package]] -name = "move-core-types" -version = "0.0.4" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "bcs 0.1.4", - "bytes", - "ethnum", - "hashbrown 0.14.5", - "hex", - "num", - "once_cell", - "primitive-types 0.10.1", - "rand 0.8.5", - "ref-cast", - "serde", - "serde_bytes", - "thiserror", - "uint", -] - [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bcs 0.1.4", "clap 4.5.4", "codespan", "colored", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-bytecode-source-map", + "move-command-line-common", + "move-core-types", + "move-ir-types", "once_cell", "petgraph 0.5.1", "serde", ] -[[package]] -name = "move-coverage" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "bcs 0.1.4", - "clap 4.5.4", - "codespan", - "colored", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "once_cell", - "petgraph 0.5.1", - "serde", -] - -[[package]] -name = "move-disassembler" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "clap 4.5.4", - "colored", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-coverage 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", -] - [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "clap 4.5.4", "colored", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-coverage 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-bytecode-source-map", + "move-bytecode-verifier", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-coverage", + "move-ir-types", ] [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "codespan", "codespan-reporting", "itertools 0.10.5", "log", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-compiler", + "move-core-types", + "move-model", "num", "once_cell", "regex", "serde", ] -[[package]] -name = "move-docgen" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "codespan", - "codespan-reporting", - "itertools 0.10.5", - "log", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "num", - "once_cell", - "regex", - "serde", -] - -[[package]] -name = "move-errmapgen" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "bcs 0.1.4", - "log", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "serde", -] - [[package]] name = "move-errmapgen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bcs 0.1.4", "log", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-command-line-common", + "move-core-types", + "move-model", "serde", ] [[package]] name = "move-ir-compiler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bcs 0.1.4", "clap 4.5.4", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-to-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-bytecode-source-map", + "move-bytecode-verifier", + "move-command-line-common", + "move-core-types", + "move-ir-to-bytecode", + "move-ir-types", + "move-symbol-pool", "serde_json", ] [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "codespan-reporting", "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-to-bytecode-syntax 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "ouroboros 0.9.5", - "thiserror", -] - -[[package]] -name = "move-ir-to-bytecode" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "codespan-reporting", - "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-to-bytecode-syntax 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-bytecode-source-map", + "move-command-line-common", + "move-core-types", + "move-ir-to-bytecode-syntax", + "move-ir-types", + "move-symbol-pool", "ouroboros 0.9.5", "thiserror", ] @@ -8012,53 +6816,26 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "hex", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", -] - -[[package]] -name = "move-ir-to-bytecode-syntax" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "hex", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", -] - -[[package]] -name = "move-ir-types" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "hex", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "serde", + "move-command-line-common", + "move-core-types", + "move-ir-types", + "move-symbol-pool", ] [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "hex", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-command-line-common", + "move-core-types", + "move-symbol-pool", "once_cell", "serde", ] @@ -8066,7 +6843,7 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "codespan", @@ -8074,15 +6851,15 @@ dependencies = [ "internment", "itertools 0.10.5", "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-disassembler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-bytecode-source-map", + "move-bytecode-verifier", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-disassembler", + "move-ir-types", + "move-symbol-pool", "num", "num-traits", "once_cell", @@ -8091,75 +6868,10 @@ dependencies = [ "trace", ] -[[package]] -name = "move-model" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "codespan", - "codespan-reporting", - "internment", - "itertools 0.10.5", - "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-disassembler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "num", - "num-traits", - "once_cell", - "regex", - "serde", - "trace", -] - -[[package]] -name = "move-package" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "bcs 0.1.4", - "clap 4.5.4", - "colored", - "dirs-next", - "itertools 0.10.5", - "move-abigen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler-v2 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "named-lock", - "once_cell", - "petgraph 0.5.1", - "regex", - "reqwest", - "serde", - "serde_yaml 0.8.26", - "sha2 0.9.9", - "tempfile", - "termcolor", - "toml 0.5.11", - "walkdir", - "whoami", -] - [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bcs 0.1.4", @@ -8167,17 +6879,17 @@ dependencies = [ "colored", "dirs-next", "itertools 0.10.5", - "move-abigen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-source-map 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler-v2 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-abigen", + "move-binary-format", + "move-bytecode-source-map", + "move-bytecode-utils", + "move-command-line-common", + "move-compiler", + "move-compiler-v2", + "move-core-types", + "move-docgen", + "move-model", + "move-symbol-pool", "named-lock", "once_cell", "petgraph 0.5.1", @@ -8196,46 +6908,7 @@ dependencies = [ [[package]] name = "move-prover" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "async-trait", - "atty", - "clap 4.5.4", - "codespan", - "codespan-reporting", - "futures", - "hex", - "itertools 0.10.5", - "log", - "move-abigen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler-v2 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-errmapgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-prover-boogie-backend 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-prover-bytecode-pipeline 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-stackless-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num", - "once_cell", - "pretty", - "rand 0.8.5", - "serde", - "serde_json", - "simplelog", - "tokio", - "toml 0.5.11", -] - -[[package]] -name = "move-prover" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "async-trait", @@ -8247,19 +6920,19 @@ dependencies = [ "hex", "itertools 0.10.5", "log", - "move-abigen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler-v2 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-errmapgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-prover-boogie-backend 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-prover-bytecode-pipeline 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-stackless-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-abigen", + "move-binary-format", + "move-command-line-common", + "move-compiler", + "move-compiler-v2", + "move-core-types", + "move-docgen", + "move-errmapgen", + "move-ir-types", + "move-model", + "move-prover-boogie-backend", + "move-prover-bytecode-pipeline", + "move-stackless-bytecode", "num", "once_cell", "pretty", @@ -8274,37 +6947,7 @@ dependencies = [ [[package]] name = "move-prover-boogie-backend" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "async-trait", - "codespan", - "codespan-reporting", - "futures", - "itertools 0.10.5", - "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-prover-bytecode-pipeline 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-stackless-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num", - "once_cell", - "pretty", - "rand 0.8.5", - "regex", - "serde", - "serde_json", - "tera", - "tokio", -] - -[[package]] -name = "move-prover-boogie-backend" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "async-trait", @@ -8313,13 +6956,13 @@ dependencies = [ "futures", "itertools 0.10.5", "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-prover-bytecode-pipeline 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-stackless-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-model", + "move-prover-bytecode-pipeline", + "move-stackless-bytecode", "num", "once_cell", "pretty", @@ -8334,40 +6977,9 @@ dependencies = [ [[package]] name = "move-prover-bytecode-pipeline" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "abstract-domain-derive 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "anyhow", - "async-trait", - "atty", - "clap 4.5.4", - "codespan", - "codespan-reporting", - "futures", - "hex", - "itertools 0.10.5", - "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-stackless-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num", - "once_cell", - "pretty", - "rand 0.8.5", - "serde", - "serde_json", - "simplelog", - "tokio", - "toml 0.5.11", -] - -[[package]] -name = "move-prover-bytecode-pipeline" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "abstract-domain-derive 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "abstract-domain-derive", "anyhow", "async-trait", "atty", @@ -8378,10 +6990,10 @@ dependencies = [ "hex", "itertools 0.10.5", "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-stackless-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-core-types", + "move-model", + "move-stackless-bytecode", "num", "once_cell", "pretty", @@ -8396,29 +7008,14 @@ dependencies = [ [[package]] name = "move-resource-viewer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bcs 0.1.4", "hex", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "serde", -] - -[[package]] -name = "move-resource-viewer" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" -dependencies = [ - "anyhow", - "bcs 0.1.4", - "hex", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-bytecode-utils", + "move-core-types", "once_cell", "serde", ] @@ -8439,50 +7036,23 @@ dependencies = [ [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "abstract-domain-derive 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "codespan", - "codespan-reporting", - "ethnum", - "im", - "itertools 0.10.5", - "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-borrow-graph 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-to-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "num", - "once_cell", - "paste", - "petgraph 0.5.1", - "serde", -] - -[[package]] -name = "move-stackless-bytecode" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ - "abstract-domain-derive 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "abstract-domain-derive", "codespan", "codespan-reporting", "ethnum", "im", "itertools 0.10.5", "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-borrow-graph 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-to-bytecode 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-borrow-graph", + "move-bytecode-verifier", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-ir-to-bytecode", + "move-model", "num", "once_cell", "paste", @@ -8493,43 +7063,20 @@ dependencies = [ [[package]] name = "move-stdlib" version = "0.1.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "hex", - "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-errmapgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-prover 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "sha2 0.9.9", - "sha3", - "smallvec", - "walkdir", -] - -[[package]] -name = "move-stdlib" -version = "0.1.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "hex", "log", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-docgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-errmapgen 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-prover 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-docgen", + "move-errmapgen", + "move-prover", + "move-vm-runtime", + "move-vm-types", "sha2 0.9.9", "sha3", "smallvec", @@ -8539,16 +7086,7 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "once_cell", - "serde", -] - -[[package]] -name = "move-symbol-pool" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "once_cell", "serde", @@ -8557,34 +7095,16 @@ dependencies = [ [[package]] name = "move-table-extension" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "bcs 0.1.4", - "better_any", - "bytes", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "sha3", - "smallvec", -] - -[[package]] -name = "move-table-extension" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bcs 0.1.4", "better_any", "bytes", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-core-types", + "move-vm-runtime", + "move-vm-types", "once_cell", "sha3", "smallvec", @@ -8593,38 +7113,7 @@ dependencies = [ [[package]] name = "move-unit-test" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "better_any", - "bytes", - "clap 4.5.4", - "codespan-reporting", - "colored", - "itertools 0.10.5", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-resource-viewer 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-stdlib 0.1.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-table-extension 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-test-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "rayon", - "regex", -] - -[[package]] -name = "move-unit-test" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "better_any", @@ -8633,20 +7122,20 @@ dependencies = [ "codespan-reporting", "colored", "itertools 0.10.5", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-command-line-common 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-compiler 0.0.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-ir-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-model 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-resource-viewer 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-stdlib 0.1.1 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-symbol-pool 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-table-extension 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-runtime 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-test-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-bytecode-utils", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-ir-types", + "move-model", + "move-resource-viewer", + "move-stdlib", + "move-symbol-pool", + "move-table-extension", + "move-vm-runtime", + "move-vm-test-utils", + "move-vm-types", "once_cell", "rayon", "regex", @@ -8655,32 +7144,7 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "better_any", - "bytes", - "fail 0.4.0", - "hashbrown 0.14.5", - "lazy_static", - "lru 0.7.8", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "parking_lot 0.11.2", - "serde", - "sha3", - "smallbitvec", - "tracing", - "triomphe", - "typed-arena", -] - -[[package]] -name = "move-vm-runtime" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "better_any", "bytes", @@ -8688,10 +7152,10 @@ dependencies = [ "hashbrown 0.14.5", "lazy_static", "lru 0.7.8", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-bytecode-verifier 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-bytecode-verifier", + "move-core-types", + "move-vm-types", "once_cell", "parking_lot 0.11.2", "serde", @@ -8705,60 +7169,28 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "anyhow", - "bytes", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-table-extension 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "once_cell", - "serde", -] - -[[package]] -name = "move-vm-test-utils" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "anyhow", "bytes", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-table-extension 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-vm-types 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "once_cell", - "serde", -] - -[[package]] -name = "move-vm-types" -version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=monza#e62577b0cccfbb93a370c9589e8c2906bea818b9" -dependencies = [ - "bcs 0.1.4", - "derivative", - "itertools 0.10.5", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=monza)", + "move-binary-format", + "move-core-types", + "move-table-extension", + "move-vm-types", "once_cell", "serde", - "smallbitvec", - "smallvec", - "triomphe", ] [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp#9139fb01a2c0be09757bba77c3dc6d1ce6b3e4d6" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=7d807dcbd8796e760d272db2fd7903e6d8449730#7d807dcbd8796e760d272db2fd7903e6d8449730" dependencies = [ "bcs 0.1.4", "derivative", "itertools 0.10.5", - "move-binary-format 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", - "move-core-types 0.0.4 (git+https://github.com/movementlabsxyz/aptos-core?branch=zkfp)", + "move-binary-format", + "move-core-types", "once_cell", "serde", "smallbitvec", @@ -9037,17 +7469,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", -] - [[package]] name = "num-format" version = "0.4.4" @@ -10070,15 +8491,6 @@ dependencies = [ "prost", ] -[[package]] -name = "protobuf-src" -version = "1.1.0+21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1" -dependencies = [ - "autotools", -] - [[package]] name = "psl-types" version = "2.0.11" @@ -10449,7 +8861,6 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -10459,7 +8870,6 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -10468,7 +8878,6 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -10476,7 +8885,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", "winreg", ] @@ -10553,158 +8961,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "risc0-binfmt" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae2939426c60756f910352184716a3538748208c9e11ade4a507db3b2757157" -dependencies = [ - "anyhow", - "elf", - "risc0-zkp", - "risc0-zkvm-platform", - "serde", - "tracing", -] - -[[package]] -name = "risc0-build" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a6a0138c9ae1d82eaa2ab6047535481a17641ba6c354890770bf94fbef8049" -dependencies = [ - "anyhow", - "cargo-platform", - "cargo_metadata 0.17.0", - "docker-generate", - "risc0-binfmt", - "risc0-zkp", - "risc0-zkvm-platform", - "serde", - "serde_json", - "tempfile", -] - -[[package]] -name = "risc0-circuit-recursion" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a43cade35f73ad81ba974fe1d5e1513331f87052af8377b26b00a838f39c6920" -dependencies = [ - "anyhow", - "bytemuck", - "hex", - "risc0-core", - "risc0-zkp", - "tracing", -] - -[[package]] -name = "risc0-circuit-rv32im" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31440989146b342a7d37c15079c9568c69b7f988f3b789f422c7d4ed76526ddb" -dependencies = [ - "anyhow", - "risc0-core", - "risc0-zkp", - "risc0-zkvm-platform", - "tracing", -] - -[[package]] -name = "risc0-core" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0cbd09d03c23b572b66cd96a56143adb22bf895aca89c1a153ccebedaa0b4" -dependencies = [ - "bytemuck", - "rand_core 0.6.4", -] - -[[package]] -name = "risc0-groth16" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1e9b8dae3f9c3862b6278b2812989a2f5a537975e5bd6a687f07cf1df68a36" -dependencies = [ - "anyhow", - "ark-bn254", - "ark-groth16", - "ark-serialize 0.4.2", - "hex", - "num-bigint 0.4.4", - "num-derive 0.4.2", - "num-traits", - "risc0-zkp", - "serde", -] - -[[package]] -name = "risc0-zkp" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96b035f744ecaaa7e9809c699bc85cf669cbab6f297f141d918e9b4c8098b79" -dependencies = [ - "anyhow", - "blake2", - "bytemuck", - "digest 0.10.7", - "hex", - "paste", - "rand_core 0.6.4", - "risc0-core", - "risc0-zkvm-platform", - "serde", - "sha2 0.10.8", - "tracing", -] - -[[package]] -name = "risc0-zkvm" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1275834c86176efc122a172c2b5f271a8a5d792de7efbc47dfbecaaaff9432" -dependencies = [ - "anyhow", - "bincode", - "bonsai-sdk", - "bytemuck", - "bytes", - "cfg-if", - "getrandom 0.2.14", - "hex", - "num-derive 0.4.2", - "num-traits", - "prost", - "prost-build", - "protobuf-src", - "risc0-binfmt", - "risc0-circuit-recursion", - "risc0-circuit-rv32im", - "risc0-core", - "risc0-groth16", - "risc0-zkp", - "risc0-zkvm-platform", - "rrs-lib", - "semver 1.0.22", - "serde", - "sha2 0.10.8", - "tempfile", - "tracing", -] - -[[package]] -name = "risc0-zkvm-platform" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b6378c9e407be18a1560ed030fd87fb6056293c56263efac46c507ae97e0d7" -dependencies = [ - "bytemuck", - "getrandom 0.2.14", - "libm", -] - [[package]] name = "rlp" version = "0.5.2" @@ -10725,16 +8981,6 @@ dependencies = [ "librocksdb-sys", ] -[[package]] -name = "rrs-lib" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4382d3af3a4ebdae7f64ba6edd9114fff92c89808004c4943b393377a25d001" -dependencies = [ - "downcast-rs", - "paste", -] - [[package]] name = "rsa" version = "0.9.6" @@ -11518,7 +9764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" dependencies = [ "bytecount", - "cargo_metadata 0.14.2", + "cargo_metadata", "error-chain", "glob", "pulldown-cmark", @@ -12943,12 +11189,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "whoami" version = "1.5.1" diff --git a/Cargo.toml b/Cargo.toml index 196be406b..c80f46065 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,10 +14,6 @@ members = [ "util/buildtime/buildtime-macros", "networks/monza/*", - - "protocol-units/zkfp/host", - "protocol-units/zkfp/methods", - "protocol-units/zkfp/methods/guest", ] [workspace.package] @@ -27,6 +23,7 @@ license = "MIT OR Apache-2.0" authors = ["Movement Labs"] repository = "www.github.com/movementlabs/movement" homepage = "www.homepage.com" +resolver = "2" publish = false rust-version = "1.75" @@ -165,32 +162,33 @@ ethers-middleware = { version = "=2.0.10", default-features = false } # Aptos dependencies # We use a forked version so that we can override dependency versions. This is required # to be avoid depenedency conflicts with other Sovereign Labs crates. -aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza", features = [ +aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730", features = [ "cloneable-private-keys", ] } -aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", branch = "monza" } -aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", branch = "monza" } -aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } -aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } +aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } +aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } bcs = { git = "https://github.com/aptos-labs/bcs.git", rev = "d31fab9d81748e2594be5cd5cdf845786a30562d" } move-binary-format = { git = "https://github.com/diem/move" } @@ -213,7 +211,7 @@ secp256k1 = { version = "0.27", default-features = false, features = [ "rand-std", "recovery", ] } -aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" } +aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" } # celestia dependencies celestia-rpc = { git = "https://github.com/eigerco/lumina" } @@ -223,10 +221,6 @@ celestia-types = { git = "https://github.com/eigerco/lumina" } futures = "0.3.17" -# zkfp -methods = { path = "protocol-units/zkfp/methods" } - - [workspace.lints.rust] dead_code = "deny" unused_imports = "deny" diff --git a/README.md b/README.md index e906cba51..899aa88ec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # `movement-sdk` The Movement SDK is a collection of tools and libraries for building, deploying, and working with Movement Labs infrastructure. The SDK is designed to be modular and extensible, allowing developers to build custom tools and libraries on top of the core components as well as to interact with Movement Labs' own networks. +**Note:** unless otherwise specified assume all commands below are run after entering a nix shell with `nix develop`. + ## Organization - [`scripts`](./scripts): Scripts for running Movement Labs software. See the [scripts README](./scripts/README.md) for more information about the organization of scripts. - [`process-compose`](./process-compose): Process compose files for running Movement Labs software. These files are part of the standard flow for running and testing components in the Movement Network. See the [scripts README](./scripts/README.md) for more information about the organization of scripts. @@ -13,13 +15,24 @@ The Movement SDK is a collection of tools and libraries for building, deploying, - **Features**: - `local`: Run a local Celestia Data Availability service. (Default.) - `arabica`: Run an Arabica Celestia Data Availability service. (Overrides local.) - - `test`: Run the test suite for the `m1-da-light-node`. (Can be combined with `local` or `arabica`.) + - `test`: Run the test suite for the `m1-da-light-node`. (Can be combined with `local` or `arabica`. Exits on completion by default.) ```bash # example test with local Celestia Data Availability service just m1-da-light-node test.local ``` +# `monza-full-node` + +- **Features**: + - `local`: Run a local Celesta Data Availability service. + - `test`: run the test suite for `monza-full-node`. (Can be combined with `local`. Exits on completion by default.) + +```bash +# example test with local +just monza-full-node test.local +``` + ## License This project is licensed under the Apache 2.0 License - see the [LICENSE](LICENSE) file for details. diff --git a/protocol-units/dispute/lib/murky b/protocol-units/dispute/lib/murky new file mode 160000 index 000000000..5feccd125 --- /dev/null +++ b/protocol-units/dispute/lib/murky @@ -0,0 +1 @@ +Subproject commit 5feccd1253d7da820f7cccccdedf64471025455d diff --git a/protocol-units/dispute/lib/openzeppelin-contracts b/protocol-units/dispute/lib/openzeppelin-contracts new file mode 160000 index 000000000..4032b4269 --- /dev/null +++ b/protocol-units/dispute/lib/openzeppelin-contracts @@ -0,0 +1 @@ +Subproject commit 4032b42694ff6599b17ffde65b2b64d7fc8a38f8 diff --git a/protocol-units/execution/monza/executor/Cargo.toml b/protocol-units/execution/monza/executor/Cargo.toml index b9adf3c7e..f628f64ba 100644 --- a/protocol-units/execution/monza/executor/Cargo.toml +++ b/protocol-units/execution/monza/executor/Cargo.toml @@ -59,6 +59,7 @@ aptos-executor-test-helpers = { workspace = true } aptos-bitvec = { workspace = true } aptos-mempool = { workspace = true } aptos-temppath = { workspace = true } +aptos-proptest-helpers = { workspace = true } monza-opt-executor = { workspace = true } monza-execution-util = { workspace = true } diff --git a/protocol-units/execution/monza/executor/src/v1.rs b/protocol-units/execution/monza/executor/src/v1.rs index 3fd87e0d6..7dac6068f 100644 --- a/protocol-units/execution/monza/executor/src/v1.rs +++ b/protocol-units/execution/monza/executor/src/v1.rs @@ -1,122 +1,117 @@ use crate::*; -use monza_opt_executor::Executor; -use async_channel::Sender; use aptos_types::transaction::SignedTransaction; +use async_channel::Sender; +use monza_opt_executor::Executor; #[derive(Clone)] pub struct MonzaExecutorV1 { - // this rwlock may be somewhat redundant - pub executor: Executor, - pub transaction_channel: Sender, + // this rwlock may be somewhat redundant + pub executor: Executor, + pub transaction_channel: Sender, } impl MonzaExecutorV1 { - pub fn new(executor : Executor, transaction_channel: Sender) -> Self { - Self { - executor, - transaction_channel, - } - } - - pub async fn try_from_env(transaction_channel : Sender) -> Result { - let executor = Executor::try_from_env()?; - Ok(Self::new(executor, transaction_channel)) - } + pub fn new(executor: Executor, transaction_channel: Sender) -> Self { + Self { executor, transaction_channel } + } + pub async fn try_from_env( + transaction_channel: Sender, + ) -> Result { + let executor = Executor::try_from_env()?; + Ok(Self::new(executor, transaction_channel)) + } } #[tonic::async_trait] impl MonzaExecutor for MonzaExecutorV1 { + /// Runs the service. + async fn run_service(&self) -> Result<(), anyhow::Error> { + self.executor.run_service().await + } + + /// Runs the necessary background tasks. + async fn run_background_tasks(&self) -> Result<(), anyhow::Error> { + loop { + // readers should be able to run concurrently + self.executor.tick_transaction_pipe(self.transaction_channel.clone()).await?; + } + + Ok(()) + } - /// Runs the service. - async fn run_service(&self) -> Result<(), anyhow::Error> { - self.executor.run_service().await - } - - /// Runs the necessary background tasks. - async fn run_background_tasks(&self) -> Result<(), anyhow::Error> { - - loop { - // readers should be able to run concurrently - self.executor.tick_transaction_pipe(self.transaction_channel.clone()).await?; - } - - Ok(()) - - } - - /// Executes a block dynamically - async fn execute_block( - &self, - mode : &FinalityMode, - block: ExecutableBlock, - ) -> Result<(), anyhow::Error> { - - match mode { - FinalityMode::Dyn => unimplemented!(), - FinalityMode::Opt => { - println!("Executing opt block: {:?}", block.block_id); - self.executor.execute_block(block).await - }, - FinalityMode::Fin => unimplemented!(), - } - - } - - /// Sets the transaction channel. - async fn set_tx_channel(&mut self, tx_channel: Sender) -> Result<(), anyhow::Error> { - self.transaction_channel = tx_channel; - Ok(()) - } - - /// Gets the API. - async fn get_api( - &self, - _mode : &FinalityMode, - ) -> Result { - match _mode { - FinalityMode::Dyn => unimplemented!(), - FinalityMode::Opt => { - Ok(self.executor.try_get_apis().await?) - }, - FinalityMode::Fin => unimplemented!(), - } - } - - /// Get block head height. - async fn get_block_head_height(&self) -> Result { - // ideally, this should read from the ledger - Ok(1) - } + /// Executes a block dynamically + async fn execute_block( + &self, + mode: &FinalityMode, + block: ExecutableBlock, + ) -> Result<(), anyhow::Error> { + match mode { + FinalityMode::Dyn => unimplemented!(), + FinalityMode::Opt => { + println!("Executing opt block: {:?}", block.block_id); + self.executor.execute_block(block).await + }, + FinalityMode::Fin => unimplemented!(), + } + } + /// Sets the transaction channel. + async fn set_tx_channel( + &mut self, + tx_channel: Sender, + ) -> Result<(), anyhow::Error> { + self.transaction_channel = tx_channel; + Ok(()) + } + + /// Gets the API. + async fn get_api(&self, _mode: &FinalityMode) -> Result { + match _mode { + FinalityMode::Dyn => unimplemented!(), + FinalityMode::Opt => Ok(self.executor.try_get_apis().await?), + FinalityMode::Fin => unimplemented!(), + } + } + + /// Get block head height. + async fn get_block_head_height(&self) -> Result { + // ideally, this should read from the ledger + Ok(1) + } } #[cfg(test)] -mod opt_tests { +mod tests { + + use std::collections::HashMap; use super::*; + use aptos_api::{accept_type::AcceptType, transactions::SubmitTransactionPost}; use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519Signature}, HashValue, PrivateKey, Uniform, }; + use aptos_mempool::{MempoolClientRequest, MempoolClientSender}; + use aptos_sdk::{ + transaction_builder::TransactionFactory, + types::{AccountKey, LocalAccount}, + }; + use aptos_storage_interface::state_view::DbStateViewAtVersion; use aptos_types::{ account_address::AccountAddress, + account_config::aptos_test_root_address, block_executor::partitioner::ExecutableTransactions, chain_id::ChainId, + ledger_info::LedgerInfoWithSignatures, transaction::{ signature_verified_transaction::SignatureVerifiedTransaction, RawTransaction, Script, - SignedTransaction, Transaction, TransactionPayload - } + SignedTransaction, Transaction, TransactionPayload, Version, + }, }; - use aptos_api::{ - accept_type::AcceptType, - transactions::SubmitTransactionPost - }; - use futures::SinkExt; - use aptos_mempool::{ - MempoolClientRequest, MempoolClientSender, - }; - use futures::channel::oneshot; + use futures::channel::oneshot; + use futures::SinkExt; + use rand::SeedableRng; fn create_signed_transaction(gas_unit_price: u64) -> SignedTransaction { let private_key = Ed25519PrivateKey::generate_for_testing(); @@ -134,10 +129,9 @@ mod opt_tests { SignedTransaction::new(raw_transaction, public_key, Ed25519Signature::dummy_signature()) } - #[tokio::test] async fn test_execute_opt_block() -> Result<(), anyhow::Error> { - let (tx, rx) = async_channel::unbounded(); + let (tx, rx) = async_channel::unbounded(); let mut executor = MonzaExecutorV1::try_from_env(tx).await?; let block_id = HashValue::random(); let tx = SignatureVerifiedTransaction::Valid(Transaction::UserTransaction( @@ -149,91 +143,241 @@ mod opt_tests { Ok(()) } - #[tokio::test] async fn test_pipe_transactions_from_api() -> Result<(), anyhow::Error> { - - let (tx, rx) = async_channel::unbounded(); + let (tx, rx) = async_channel::unbounded(); let executor = MonzaExecutorV1::try_from_env(tx).await?; let services_executor = executor.clone(); - let background_executor = executor.clone(); + let background_executor = executor.clone(); - let services_handle = tokio::spawn(async move { - services_executor.run_service().await?; - Ok(()) as Result<(), anyhow::Error> - }); + let services_handle = tokio::spawn(async move { + services_executor.run_service().await?; + Ok(()) as Result<(), anyhow::Error> + }); - let background_handle = tokio::spawn(async move { - background_executor.run_background_tasks().await?; - Ok(()) as Result<(), anyhow::Error> - }); + let background_handle = tokio::spawn(async move { + background_executor.run_background_tasks().await?; + Ok(()) as Result<(), anyhow::Error> + }); - // Start the background tasks + // Start the background tasks let user_transaction = create_signed_transaction(0); let comparison_user_transaction = user_transaction.clone(); let bcs_user_transaction = bcs::to_bytes(&user_transaction)?; - - let request = SubmitTransactionPost::Bcs( - aptos_api::bcs_payload::Bcs(bcs_user_transaction) - ); + let request = SubmitTransactionPost::Bcs(aptos_api::bcs_payload::Bcs(bcs_user_transaction)); let api = executor.get_api(&FinalityMode::Opt).await?; api.transactions.submit_transaction(AcceptType::Bcs, request).await?; services_handle.abort(); - background_handle.abort(); + background_handle.abort(); let received_transaction = rx.recv().await?; assert_eq!(received_transaction, comparison_user_transaction); - + Ok(()) } - #[tokio::test] + #[tokio::test] async fn test_pipe_transactions_from_api_and_execute() -> Result<(), anyhow::Error> { - - let (tx, rx) = async_channel::unbounded(); + let (tx, rx) = async_channel::unbounded(); let executor = MonzaExecutorV1::try_from_env(tx).await?; let services_executor = executor.clone(); - let background_executor = executor.clone(); + let background_executor = executor.clone(); - let services_handle = tokio::spawn(async move { - services_executor.run_service().await?; - Ok(()) as Result<(), anyhow::Error> - }); + let services_handle = tokio::spawn(async move { + services_executor.run_service().await?; + Ok(()) as Result<(), anyhow::Error> + }); - let background_handle = tokio::spawn(async move { - background_executor.run_background_tasks().await?; - Ok(()) as Result<(), anyhow::Error> - }); + let background_handle = tokio::spawn(async move { + background_executor.run_background_tasks().await?; + Ok(()) as Result<(), anyhow::Error> + }); - // Start the background tasks + // Start the background tasks let user_transaction = create_signed_transaction(0); let comparison_user_transaction = user_transaction.clone(); let bcs_user_transaction = bcs::to_bytes(&user_transaction)?; - - let request = SubmitTransactionPost::Bcs( - aptos_api::bcs_payload::Bcs(bcs_user_transaction) - ); + let request = SubmitTransactionPost::Bcs(aptos_api::bcs_payload::Bcs(bcs_user_transaction)); let api = executor.get_api(&FinalityMode::Opt).await?; api.transactions.submit_transaction(AcceptType::Bcs, request).await?; let received_transaction = rx.recv().await?; assert_eq!(received_transaction, comparison_user_transaction); - // Now execute the block - let block_id = HashValue::random(); - let tx = SignatureVerifiedTransaction::Valid(Transaction::UserTransaction( - received_transaction - )); - let txs = ExecutableTransactions::Unsharded(vec![tx]); - let block = ExecutableBlock::new(block_id.clone(), txs); - executor.execute_block(&FinalityMode::Opt, block).await?; + // Now execute the block + let block_id = HashValue::random(); + let tx = + SignatureVerifiedTransaction::Valid(Transaction::UserTransaction(received_transaction)); + let txs = ExecutableTransactions::Unsharded(vec![tx]); + let block = ExecutableBlock::new(block_id.clone(), txs); + executor.execute_block(&FinalityMode::Opt, block).await?; - services_handle.abort(); - background_handle.abort(); + services_handle.abort(); + background_handle.abort(); Ok(()) } + #[tokio::test] + async fn test_revert_chain_state_at_nth_commit() -> Result<(), anyhow::Error> { + use aptos_db::db::test_helper::arb_blocks_to_commit_with_block_nums; + use aptos_proptest_helpers::ValueGenerator; + + #[derive(Debug)] + struct Commit { + hash: HashValue, + info: LedgerInfoWithSignatures, + cur_ver: Version, + } + + let (tx, rx) = async_channel::unbounded::(); + let executor = MonzaExecutorV1::try_from_env(tx).await?; + let services_executor = executor.clone(); + let background_executor = executor.clone(); + let services_handle = tokio::spawn(async move { + services_executor.run_service().await?; + Ok(()) as Result<(), anyhow::Error> + }); + + let background_handle = tokio::spawn(async move { + background_executor.run_background_tasks().await?; + Ok(()) as Result<(), anyhow::Error> + }); + let mut committed_blocks = HashMap::new(); + + let mut val_generator = ValueGenerator::new(); + // set range of min and max blocks to 5 to always gen 5 blocks + let (blocks, _) = val_generator.generate(arb_blocks_to_commit_with_block_nums(5, 5)); + let mut blockheight = 0; + let mut cur_ver: Version = 0; + let mut commit_versions = vec![]; + + for (txns_to_commit, ledger_info_with_sigs) in &blocks { + let user_transaction = create_signed_transaction(0); + let comparison_user_transaction = user_transaction.clone(); + let bcs_user_transaction = bcs::to_bytes(&user_transaction)?; + + let request = + SubmitTransactionPost::Bcs(aptos_api::bcs_payload::Bcs(bcs_user_transaction)); + let api = executor.get_api(&FinalityMode::Opt).await?; + api.transactions.submit_transaction(AcceptType::Bcs, request).await?; + + let received_transaction = rx.recv().await?; + assert_eq!(received_transaction, comparison_user_transaction); + + // Now execute the block + let block_id = HashValue::random(); + let tx = SignatureVerifiedTransaction::Valid(Transaction::UserTransaction( + received_transaction, + )); + let txs = ExecutableTransactions::Unsharded(vec![tx]); + let block = ExecutableBlock::new(block_id.clone(), txs); + executor.execute_block(&FinalityMode::Opt, block).await?; + + blockheight += 1; + committed_blocks.insert( + blockheight, + Commit { + hash: ledger_info_with_sigs.commit_info().executed_state_id(), + info: ledger_info_with_sigs.clone(), + cur_ver, + }, + ); + commit_versions.push(cur_ver); + cur_ver += txns_to_commit.len() as u64; + blockheight += 1; + } + + // Get the 3rd block back from the latest block + let revert_block_num = blockheight - 3; + let revert = committed_blocks.get(&revert_block_num).unwrap(); + + // Get the version to revert to + let version_to_revert = revert.cur_ver - 1; + + if let Some((max_blockheight, last_commit)) = + committed_blocks.iter().max_by_key(|(&k, _)| k) + { + let db = executor.executor.db.clone(); + let mut db_writer = db.write_owned().await.writer.clone(); + db_writer.revert_commit( + version_to_revert, + last_commit.cur_ver, + revert.hash, + revert.info.clone(), + )?; + + drop(db_writer); + } else { + panic!("No blocks to revert"); + } + + let db_reader = executor.executor.db.read_owned().await.reader.clone(); + let latest_version = db_reader.get_latest_version()?; + assert_eq!(db_reader.get_latest_version().unwrap(), version_to_revert - 1); + + services_handle.abort(); + background_handle.abort(); + Ok(()) + } + + #[tokio::test] + async fn test_execute_block_state_get_api() -> Result<(), anyhow::Error> { + // Create an executor instance from the environment configuration. + let executor = Executor::try_from_env()?; + + // Initialize a root account using a predefined keypair and the test root address. + let root_account = LocalAccount::new( + aptos_test_root_address(), + AccountKey::from_private_key(executor.monza_config.aptos_private_key.clone()), + 0, + ); + + // Seed for random number generator, used here to generate predictable results in a test environment. + let seed = [3u8; 32]; + let mut rng = ::rand::rngs::StdRng::from_seed(seed); + + // Create a transaction factory with the chain ID of the executor. + let tx_factory = TransactionFactory::new(executor.monza_config.chain_id.clone()); + + // Simulate the execution of multiple blocks. + for _ in 0..10 { + // For example, create and execute 3 blocks. + let block_id = HashValue::random(); // Generate a random block ID for each block. + + // Generate new accounts and create transactions for each block. + let mut transactions = Vec::new(); + let mut transaction_hashes = Vec::new(); + for _ in 0..2 { + // Each block will contain 2 transactions. + let new_account = LocalAccount::generate(&mut rng); + let user_account_creation_tx = root_account.sign_with_transaction_builder( + tx_factory.create_user_account(new_account.public_key()), + ); + let tx_hash = user_account_creation_tx.clone().committed_hash(); + transaction_hashes.push(tx_hash); + transactions.push(Transaction::UserTransaction(user_account_creation_tx)); + } + + // Group all transactions into an unsharded block for execution. + let executable_transactions = ExecutableTransactions::Unsharded( + transactions.into_iter().map(SignatureVerifiedTransaction::Valid).collect(), + ); + let block = ExecutableBlock::new(block_id.clone(), executable_transactions); + executor.execute_block(block).await?; + + // Retrieve the executor's API interface and fetch the transaction by each hash. + let apis = executor.try_get_apis().await?; + for hash in transaction_hashes { + let _ = apis + .transactions + .get_transaction_by_hash_inner(&AcceptType::Bcs, hash.into()) + .await?; + } + } + + Ok(()) + } } diff --git a/protocol-units/zkfp/README.md b/protocol-units/zkfp/README.md deleted file mode 100644 index 9e9f63709..000000000 --- a/protocol-units/zkfp/README.md +++ /dev/null @@ -1,63 +0,0 @@ -# ZKFP - -Welcome to the Movement SDK ZKFP Project! This is an experimental implementation of Zero-Knowledge Fraud Proofs for the Move Language with the RISC Zero zkVM. For similar projects, check out out the following: -- [Layer-N ZKFP](https://www.layern.com/blog/zkfp) -- [AltLayer ZKFP](https://www.risczero.com/news/altlayer-zkfraudproofs) - -## Quick Start - -First, make sure [rustup] is installed. The -[`rust-toolchain.toml`][rust-toolchain] file will be used by `cargo` to -automatically install the correct version. - -To build all methods and execute the method within the zkVM, run the following -command: - -```bash -cargo run --bin host -# or to simply check risczero compilation -cargo check -p methods -``` - -Additionally, make sure to install the RISC0 toolchain supporting Rust 1.75.0: -```bash -cargo risczero install --version v2024-02-08.1 -``` - -You may additionally have to set 1.75.0 as the default toolchain: -```bash -rustup default 1.75.0 -``` - -### Organization -- RISC0 host code is located in the [`host`](./host) directory. -- RISC0 guest code, i.e. code that runs on the ZKVM, is located in the [`zkvm`](.guest) directory. -- A submodule for a modified version of the `move` is located in the [`vendors/move`](./vendors/move) directory. This submodule is the `zkp` branch of our fork of the `move` repository. - -### Toy Example - -We are currently trying to get a toy example of running stateless Move execution working. A more complete document with notes on this phase of the project is available at [`docs/0-to-1.md`](./docs/0-to-1.md). - - -### Executing the project locally in development mode - -During development, faster iteration upon code changes can be achieved by leveraging [dev-mode], we strongly suggest activating it during your early development phase. Furthermore, you might want to get insights into the execution statistics of your project, and this can be achieved by specifying the environment variable `RUST_LOG="[executor]=info"` before running your project. - -Put together, the command to run your project in development mode while getting execution statistics is: - -```bash -RUST_LOG="[executor]=info" RISC0_DEV_MODE=1 cargo run --bin host -``` - -### Running proofs remotely on Bonsai - -_Note: The Bonsai proving service is still in early Alpha; an API key is -required for access. [Click here to request access][bonsai access]._ - -If you have access to the URL and API key to Bonsai you can run your proofs -remotely. To prove in Bonsai mode, invoke `cargo run` with two additional -environment variables: - -```bash -BONSAI_API_KEY="YOUR_API_KEY" BONSAI_API_URL="BONSAI_URL" cargo run -``` diff --git a/protocol-units/zkfp/host/Cargo.toml b/protocol-units/zkfp/host/Cargo.toml deleted file mode 100644 index ea95a6b82..000000000 --- a/protocol-units/zkfp/host/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "host" -version = "0.0.0" -edition = "2021" - -[dependencies] -anyhow = { workspace = true } -risc0-zkvm = { workspace = true } -tracing-subscriber = { workspace = true } -tempfile = { workspace = true } -serde = { workspace = true } - -methods = { workspace = true } - - - - diff --git a/protocol-units/zkfp/host/src/main.rs b/protocol-units/zkfp/host/src/main.rs deleted file mode 100644 index 7ed8a922c..000000000 --- a/protocol-units/zkfp/host/src/main.rs +++ /dev/null @@ -1,48 +0,0 @@ -// These constants represent the RISC-V ELF and the image ID generated by risc0-build. -// The ELF is used for proving and the ID is used for verification. -// pub mod compiler; -// pub mod compiler_examples; -use methods::{GUEST_ELF, GUEST_ID}; -use risc0_zkvm::{default_prover, ExecutorEnv}; - -fn main() { - // Initialize tracing. In order to view logs, run `RUST_LOG=info cargo run` - tracing_subscriber::fmt() - .with_env_filter(tracing_subscriber::filter::EnvFilter::from_default_env()) - .init(); - - // An executor environment describes the configurations for the zkVM - // including program inputs. - // An default ExecutorEnv can be created like so: - // `let env = ExecutorEnv::builder().build().unwrap();` - // However, this `env` does not have any inputs. - // - // To add add guest input to the executor environment, use - // ExecutorEnvBuilder::write(). - // To access this method, you'll need to use ExecutorEnv::builder(), which - // creates an ExecutorEnvBuilder. When you're done adding input, call - // ExecutorEnvBuilder::build(). - - // For example: - let env = ExecutorEnv::builder() - .write(&42) - .unwrap() - .build() - .unwrap(); - - // Obtain the default prover. - let prover = default_prover(); - - // Produce a receipt by proving the specified ELF binary. - let receipt = prover.prove(env, GUEST_ELF).unwrap(); - - // TODO: Implement code for retrieving receipt journal here. - - // For example: - let output: Vec = receipt.journal.decode().unwrap(); - //println!("The move program output {:?} ", output); - - // The receipt was verified at the end of proving, but the below code is an - // example of how someone else could verify this receipt. - receipt.verify(GUEST_ID).unwrap(); -} diff --git a/protocol-units/zkfp/methods/Cargo.toml b/protocol-units/zkfp/methods/Cargo.toml deleted file mode 100644 index 17c6d6913..000000000 --- a/protocol-units/zkfp/methods/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "methods" -version = "0.1.0" -edition = "2021" - -[features] -zkfp = [] - -[build-dependencies] -risc0-build = { version = "0.21" } - -[package.metadata.risc0] -methods = ["guest"] \ No newline at end of file diff --git a/protocol-units/zkfp/methods/build.rs b/protocol-units/zkfp/methods/build.rs deleted file mode 100644 index f23f0a527..000000000 --- a/protocol-units/zkfp/methods/build.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - risc0_build::embed_methods(); -} \ No newline at end of file diff --git a/protocol-units/zkfp/methods/guest/Cargo.toml b/protocol-units/zkfp/methods/guest/Cargo.toml deleted file mode 100644 index b4d1e2b7d..000000000 --- a/protocol-units/zkfp/methods/guest/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "guest" -version = "0.1.0" -edition = "2021" - -[dependencies] -risc0-zkvm = { workspace = true, features = ["std", "getrandom"] } -tempfile = { workspace = true } - -# Aptos dependencies -aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "zkfp" } -aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "zkfp" } -aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "zkfp" } \ No newline at end of file diff --git a/protocol-units/zkfp/methods/guest/src/main.rs b/protocol-units/zkfp/methods/guest/src/main.rs deleted file mode 100644 index 67c338807..000000000 --- a/protocol-units/zkfp/methods/guest/src/main.rs +++ /dev/null @@ -1,24 +0,0 @@ -#![no_main] -// If you want to try std support, also update the guest Cargo.toml file - -// pub mod move_vm_integration_run; -use aptos_vm::AptosVM; -use aptos_executor::block_executor::{self, BlockExecutor}; -use aptos_storage_interface::{mock::MockDbReaderWriter, DbReaderWriter, DbReader, DbWriter}; - -risc0_zkvm::guest::entry!(main); - -async fn does_this_even_compile() -> u8 { - 42 -} - -fn main() { - - let mock = MockDbReaderWriter; - - let block_executor = BlockExecutor::::new( - DbReaderWriter::new(mock), - ); - - -} diff --git a/protocol-units/zkfp/methods/src/lib.rs b/protocol-units/zkfp/methods/src/lib.rs deleted file mode 100644 index cd788e84c..000000000 --- a/protocol-units/zkfp/methods/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -include!(concat!(env!("OUT_DIR"), "/methods.rs")); \ No newline at end of file