From 53375a0429e3ae15cfd03d7ad2b48575a6d4981e Mon Sep 17 00:00:00 2001
From: George Mitenkov <georgemitenk0v@gmail.com>
Date: Tue, 21 Jan 2025 21:44:45 +0000
Subject: [PATCH] Fix sync from aptos-core

---
 .gitattributes                                |  31 +-
 .github/actions/README.md                     |   3 -
 .github/actions/slack-file/action.yml         |  20 -
 .../slack-file/message_file_to_slack.sh       |  87 --
 Cargo.lock                                    | 764 ++++--------------
 Cargo.toml                                    |  64 +-
 clippy.toml                                   |   2 +
 language/move-prover/src/cli.rs               |  21 +-
 rust-toolchain => rust-toolchain.toml         |   4 +-
 scripts/dev_setup.sh                          |  11 -
 10 files changed, 269 insertions(+), 738 deletions(-)
 delete mode 100644 .github/actions/README.md
 delete mode 100644 .github/actions/slack-file/action.yml
 delete mode 100755 .github/actions/slack-file/message_file_to_slack.sh
 rename rust-toolchain => rust-toolchain.toml (63%)

diff --git a/.gitattributes b/.gitattributes
index a3cd55a9d8..489630746a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,15 +1,30 @@
 # Ensure that text files that any contributor introduces to the repository
 # have their line endings normalized to LF
-* text=auto
+* text=auto eol=lf
 
 # All known text filetypes
-*.md text
-*.proto text
-*.rs text
-*.sh text
-*.toml text
-*.txt text
-*.yml text
+*.cfg text eol=lf 
+*.Dockerfile text eol=lf 
+*.hcl text eol=lf 
+*.json text eol=lf 
+*.md text eol=lf 
+*.move text eol=lf 
+*.proto text eol=lf 
+*.py text eol=lf 
+*.rs text eol=lf 
+*.sh text eol=lf 
+*.tf text eol=lf 
+*.toml text eol=lf 
+*.txt text eol=lf 
+*.yaml text eol=lf 
+*.yml text eol=lf 
+
+# Ensure that powerscript files are not auto-converted
+*.ps1 binary
 
 # Use Move syntax highlighter for Move IR code
 *.mvir linguist-language=Move
+
+# Generated files, dont show diffs etc
+**/src/pb/*.rs linguist-generated=true
+*.fixture linguist-generated=true
diff --git a/.github/actions/README.md b/.github/actions/README.md
deleted file mode 100644
index 29a25da3d7..0000000000
--- a/.github/actions/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# github actions
-
-These actions are custom for Diem Core workflows.
diff --git a/.github/actions/slack-file/action.yml b/.github/actions/slack-file/action.yml
deleted file mode 100644
index 7f6a94f729..0000000000
--- a/.github/actions/slack-file/action.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: "Send Message"
-description: |
-  Sends the contents of a file as a slack message.
-inputs:
-  payload-file:
-    description: Message file.  If the file does not exist, silently proceed without sending a message.
-    required: false
-  webhook:
-    description: Webhook for the message.
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - run: |
-        build_url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
-        ./.github/actions/slack-file/message_file_to_slack.sh -w "${WEBHOOK}" -f "${PAYLOAD_FILE}" -u "${build_url}" -d
-      shell: bash
-      env:
-        PAYLOAD_FILE: ${{ inputs.payload-file }}
-        WEBHOOK: ${{ inputs.webhook }}
diff --git a/.github/actions/slack-file/message_file_to_slack.sh b/.github/actions/slack-file/message_file_to_slack.sh
deleted file mode 100755
index ebaa0c0ac3..0000000000
--- a/.github/actions/slack-file/message_file_to_slack.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-# Copyright (c) The Diem Core Contributors
-# Copyright (c) The Move Contributors
-# SPDX-License-Identifier: Apache-2.0
-
-function echoerr() {
-  cat <<< "$@" 1>&2;
-}
-
-# Check prerequists.
-function check_command() {
-    for var in "$@"; do
-      if ! (command -v "$var" >/dev/null 2>&1); then
-          echoerr "This command requires $var to be installed"
-          exit 1
-      fi
-    done
-}
-check_command jq curl tr echo getopts
-
-function usage() {
-  echoerr -f Payload file.
-  echoerr -w Webhook to which the message will be published.
-  echoerr -d print debug messages.
-  echoerr -h this message.
-  echoerr variables it could calculate.
-}
-
-#Optional: if a private repo
-PAYLOAD_FILE=;
-WEBHOOK=;
-DEBUG=false;
-URL=;
-
-while getopts 'f:w:u:d' OPTION; do
-  case "$OPTION" in
-    f)
-      PAYLOAD_FILE="$OPTARG"
-      ;;
-    w)
-      WEBHOOK="$OPTARG"
-      ;;
-    u)
-      URL="$OPTARG"
-      ;;
-    d)
-      DEBUG=true
-      ;;
-    ?)
-      usage
-      exit 1
-      ;;
-  esac
-done
-
-if [[ "${DEBUG}" == "true" ]]; then
-  set -x
-fi
-
-if [ -e "${PAYLOAD_FILE}" ]; then
-    jq -n \
-    --arg msg "$(head -n 50 < "${PAYLOAD_FILE}")" \
-    --arg url "${URL}" \
-    '{
-        attachments: [
-        {
-            text: $msg,
-            actions: [
-            {
-                "type": "button",
-                "text": "Visit Job",
-                "url": $url
-            }
-            ],
-        }
-        ]
-    }' > /tmp/payload1234567890
-    cat /tmp/payload1234567890
-    if [ "${WEBHOOK}" ]; then
-        curl -X POST -H 'Content-type: application/json' -d @/tmp/payload1234567890 "${WEBHOOK}"
-    else
-        echo "Not sending messages as no webhook url is set."
-        echo "Chances are you are not building on main, or gha is misconfigured."
-        echo "webhook is empty"
-        exit 0
-    fi
-fi
diff --git a/Cargo.lock b/Cargo.lock
index e4d3e07f6a..a55f5859fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -86,6 +86,18 @@ version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
+[[package]]
+name = "ambassador"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b27ba24e4d8a188489d5a03c7fabc167a60809a383cdb4d15feb37479cd2a48"
+dependencies = [
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -664,9 +676,9 @@ version = "0.1.0"
 dependencies = [
  "fail",
  "hex",
- "invalid-mutations",
  "move-binary-format",
  "move-bytecode-verifier",
+ "move-bytecode-verifier-invalid-mutations",
  "move-core-types",
  "petgraph 0.5.1",
  "proptest",
@@ -958,16 +970,6 @@ dependencies = [
  "itertools 0.10.5",
 ]
 
-[[package]]
-name = "combine"
-version = "4.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
-dependencies = [
- "bytes",
- "memchr",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -989,44 +991,6 @@ dependencies = [
  "toml 0.5.11",
 ]
 
-[[package]]
-name = "cookie"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
-[[package]]
-name = "cookie_store"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6"
-dependencies = [
- "cookie",
- "idna 0.3.0",
- "log",
- "publicsuffix",
- "serde",
- "serde_derive",
- "serde_json",
- "time",
- "url",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.6"
@@ -1042,6 +1006,19 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.12"
@@ -1070,6 +1047,15 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.19"
@@ -1220,19 +1206,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "debug-ignore"
-version = "1.0.5"
+name = "dearbitrary"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe7ed1d93f4553003e20b629abe9085e1e81b1429520f897f8f8860bc6dfc21"
+checksum = "708ee6091d6965eb85c69f7a707303dcc48cc55fd937fb30e531909a10b314d4"
+dependencies = [
+ "derive_dearbitrary",
+]
 
 [[package]]
-name = "deranged"
-version = "0.3.11"
+name = "debug-ignore"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
-]
+checksum = "ffe7ed1d93f4553003e20b629abe9085e1e81b1429520f897f8f8860bc6dfc21"
 
 [[package]]
 name = "derivative"
@@ -1256,6 +1242,17 @@ dependencies = [
  "syn 2.0.60",
 ]
 
+[[package]]
+name = "derive_dearbitrary"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afdf9e6fb6c8a925c6b19b78ec3a80152e7a46dc7811be5f1fa64568e7c7b6c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -1766,7 +1763,7 @@ dependencies = [
  "is-terminal",
  "lazy_static",
  "log",
- "nu-ansi-term 0.49.0",
+ "nu-ansi-term",
  "regex",
  "thiserror",
 ]
@@ -1777,21 +1774,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -1992,8 +1974,8 @@ dependencies = [
  "aho-corasick 1.1.3",
  "bstr",
  "log",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -2067,25 +2049,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92620684d99f750bae383ecb3be3748142d6095760afd5cbcf2261e9a279d780"
 
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap 2.2.6",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "hash-db"
 version = "0.15.2"
@@ -2268,7 +2231,6 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
  "http",
  "http-body",
  "httparse",
@@ -2282,19 +2244,6 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
 [[package]]
 name = "iana-time-zone"
 version = "0.1.60"
@@ -2318,16 +2267,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -2348,7 +2287,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.6",
+ "regex-automata",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -2478,15 +2417,6 @@ dependencies = [
  "parking_lot",
 ]
 
-[[package]]
-name = "invalid-mutations"
-version = "0.1.0"
-dependencies = [
- "move-binary-format",
- "move-core-types",
- "proptest",
-]
-
 [[package]]
 name = "io-lifetimes"
 version = "1.0.11"
@@ -2498,12 +2428,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
 [[package]]
 name = "is-terminal"
 version = "0.4.12"
@@ -2631,7 +2555,7 @@ dependencies = [
  "petgraph 0.6.4",
  "pico-args",
  "regex",
- "regex-syntax 0.8.3",
+ "regex-syntax",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -2645,7 +2569,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
- "regex-automata 0.4.6",
+ "regex-automata",
 ]
 
 [[package]]
@@ -2792,15 +2716,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
 [[package]]
 name = "memchr"
 version = "2.7.2"
@@ -2874,32 +2789,11 @@ dependencies = [
  "move-model",
  "move-prover",
  "move-prover-test-utils",
+ "move-stdlib",
  "serde",
  "tempfile",
 ]
 
-[[package]]
-name = "move-async-vm"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "better_any",
- "bytes",
- "datatest-stable",
- "itertools 0.12.1",
- "move-binary-format",
- "move-command-line-common",
- "move-compiler",
- "move-core-types",
- "move-prover-test-utils",
- "move-stdlib",
- "move-vm-runtime",
- "move-vm-test-utils",
- "move-vm-types",
- "sha3 0.9.1",
- "smallvec",
-]
-
 [[package]]
 name = "move-binary-format"
 version = "0.0.3"
@@ -2907,7 +2801,9 @@ dependencies = [
  "anyhow",
  "arbitrary",
  "backtrace",
+ "dearbitrary",
  "indexmap 1.9.3",
+ "move-bytecode-spec",
  "move-core-types",
  "proptest",
  "proptest-derive",
@@ -2935,6 +2831,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "move-bytecode-spec"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "move-bytecode-utils"
 version = "0.1.0"
@@ -2952,15 +2857,24 @@ version = "0.1.0"
 dependencies = [
  "fail",
  "hex-literal",
- "invalid-mutations",
  "move-binary-format",
  "move-borrow-graph",
+ "move-bytecode-verifier-invalid-mutations",
  "move-core-types",
  "petgraph 0.5.1",
  "serde",
  "typed-arena",
 ]
 
+[[package]]
+name = "move-bytecode-verifier-invalid-mutations"
+version = "0.1.0"
+dependencies = [
+ "move-binary-format",
+ "move-core-types",
+ "proptest",
+]
+
 [[package]]
 name = "move-bytecode-viewer"
 version = "0.1.0"
@@ -2980,17 +2894,12 @@ name = "move-cli"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bcs",
- "bytes",
  "clap 4.5.4",
  "codespan-reporting",
  "colored",
  "datatest-stable",
- "difference",
  "httpmock",
  "move-binary-format",
- "move-bytecode-utils",
- "move-bytecode-verifier",
  "move-bytecode-viewer",
  "move-command-line-common",
  "move-compiler",
@@ -3000,23 +2909,15 @@ dependencies = [
  "move-disassembler",
  "move-docgen",
  "move-errmapgen",
- "move-ir-types",
  "move-model",
  "move-package",
  "move-prover",
- "move-resource-viewer",
  "move-stdlib",
  "move-unit-test",
  "move-vm-runtime",
  "move-vm-test-utils",
  "once_cell",
- "reqwest",
- "serde",
- "serde_json",
- "serde_yaml",
  "tempfile",
- "toml_edit 0.14.4",
- "walkdir",
 ]
 
 [[package]]
@@ -3056,9 +2957,9 @@ dependencies = [
  "move-stdlib",
  "move-symbol-pool",
  "once_cell",
+ "pathdiff",
  "petgraph 0.5.1",
  "regex",
- "sha3 0.9.1",
  "tempfile",
 ]
 
@@ -3078,6 +2979,7 @@ dependencies = [
  "anyhow",
  "bcs",
  "clap 4.5.4",
+ "codespan",
  "codespan-reporting",
  "datatest-stable",
  "ethnum",
@@ -3086,7 +2988,9 @@ dependencies = [
  "itertools 0.12.1",
  "log",
  "move-binary-format",
+ "move-borrow-graph",
  "move-bytecode-source-map",
+ "move-bytecode-verifier",
  "move-command-line-common",
  "move-compiler",
  "move-core-types",
@@ -3100,6 +3004,7 @@ dependencies = [
  "num",
  "once_cell",
  "petgraph 0.5.1",
+ "serde_json",
  "walkdir",
 ]
 
@@ -3125,6 +3030,7 @@ dependencies = [
  "arbitrary",
  "bcs",
  "bytes",
+ "dearbitrary",
  "ethnum",
  "hashbrown 0.14.5",
  "hex",
@@ -3182,6 +3088,7 @@ name = "move-docgen"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "clap 4.5.4",
  "codespan",
  "codespan-reporting",
  "datatest-stable",
@@ -3303,6 +3210,7 @@ dependencies = [
  "codespan",
  "codespan-reporting",
  "datatest-stable",
+ "either",
  "internment",
  "itertools 0.12.1",
  "log",
@@ -3343,6 +3251,7 @@ dependencies = [
  "move-core-types",
  "move-docgen",
  "move-model",
+ "move-stdlib",
  "move-symbol-pool",
  "move-to-yul",
  "named-lock",
@@ -3427,7 +3336,6 @@ dependencies = [
  "codespan-reporting",
  "datatest-stable",
  "itertools 0.12.1",
- "log",
  "move-binary-format",
  "move-core-types",
  "move-model",
@@ -3480,6 +3388,8 @@ dependencies = [
  "num",
  "paste",
  "petgraph 0.5.1",
+ "topological-sort",
+ "try_match",
 ]
 
 [[package]]
@@ -3595,7 +3505,7 @@ dependencies = [
  "difference",
  "move-binary-format",
  "move-bytecode-source-map",
- "move-cli",
+ "move-bytecode-verifier",
  "move-command-line-common",
  "move-compiler",
  "move-compiler-v2",
@@ -3632,10 +3542,14 @@ dependencies = [
  "itertools 0.12.1",
  "move-binary-format",
  "move-bytecode-utils",
+ "move-cli",
  "move-command-line-common",
  "move-compiler",
+ "move-compiler-v2",
  "move-core-types",
  "move-ir-types",
+ "move-model",
+ "move-package",
  "move-resource-viewer",
  "move-stdlib",
  "move-symbol-pool",
@@ -3643,10 +3557,12 @@ dependencies = [
  "move-to-yul",
  "move-vm-runtime",
  "move-vm-test-utils",
+ "move-vm-types",
  "once_cell",
  "primitive-types 0.10.1",
  "rayon",
  "regex",
+ "tempfile",
 ]
 
 [[package]]
@@ -3668,6 +3584,14 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "move-vm-metrics"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "prometheus",
+]
+
 [[package]]
 name = "move-vm-paranoid-tests"
 version = "0.1.0"
@@ -3681,9 +3605,11 @@ dependencies = [
 name = "move-vm-runtime"
 version = "0.1.0"
 dependencies = [
+ "ambassador",
  "anyhow",
  "better_any",
  "bytes",
+ "claims",
  "fail",
  "hashbrown 0.14.5",
  "hex",
@@ -3694,13 +3620,14 @@ dependencies = [
  "move-compiler",
  "move-core-types",
  "move-ir-compiler",
+ "move-vm-metrics",
+ "move-vm-test-utils",
  "move-vm-types",
  "once_cell",
  "parking_lot",
  "proptest",
  "serde",
  "sha3 0.9.1",
- "tracing",
  "triomphe",
  "typed-arena",
 ]
@@ -3709,8 +3636,10 @@ dependencies = [
 name = "move-vm-test-utils"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bytes",
  "move-binary-format",
+ "move-bytecode-utils",
  "move-core-types",
  "move-table-extension",
  "move-vm-types",
@@ -3730,15 +3659,21 @@ dependencies = [
 name = "move-vm-types"
 version = "0.1.0"
 dependencies = [
+ "ambassador",
  "bcs",
+ "bytes",
  "claims",
+ "crossbeam",
+ "dashmap",
  "derivative",
+ "hashbrown 0.14.5",
  "itertools 0.12.1",
  "move-binary-format",
  "move-core-types",
  "proptest",
  "rand 0.7.3",
  "serde",
+ "sha3 0.9.1",
  "smallbitvec",
  "smallvec",
  "triomphe",
@@ -3758,24 +3693,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "nested"
 version = "0.1.1"
@@ -3860,16 +3777,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.49.0"
@@ -3925,12 +3832,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -4011,36 +3912,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
-name = "openssl"
-version = "0.10.64"
+name = "openssl-probe"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
-dependencies = [
- "bitflags 2.5.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
@@ -4116,12 +3991,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "owo-colors"
 version = "3.5.0"
@@ -4446,12 +4315,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -4579,6 +4442,20 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "prometheus"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
+dependencies = [
+ "cfg-if",
+ "fnv",
+ "lazy_static",
+ "memchr",
+ "parking_lot",
+ "thiserror",
+]
+
 [[package]]
 name = "proptest"
 version = "1.4.0"
@@ -4593,7 +4470,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.8.3",
+ "regex-syntax",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -4610,22 +4487,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "psl-types"
-version = "2.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
-
-[[package]]
-name = "publicsuffix"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
-dependencies = [
- "idna 0.3.0",
- "psl-types",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -4838,17 +4699,8 @@ checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick 1.1.3",
  "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -4859,65 +4711,15 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick 1.1.3",
  "memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64",
- "bytes",
- "cookie",
- "cookie_store",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "winreg",
-]
-
 [[package]]
 name = "rlp"
 version = "0.5.2"
@@ -4978,15 +4780,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.15"
@@ -5060,29 +4853,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "security-framework"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.22"
@@ -5162,18 +4932,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
 [[package]]
 name = "serde_yaml"
 version = "0.8.26"
@@ -5255,15 +5013,6 @@ dependencies = [
  "keccak",
 ]
 
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
 [[package]]
 name = "shared_child"
 version = "1.0.0"
@@ -5513,33 +5262,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -5617,31 +5339,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "test-generation"
-version = "0.1.0"
-dependencies = [
- "clap 4.5.4",
- "crossbeam-channel",
- "getrandom 0.2.14",
- "hex",
- "itertools 0.12.1",
- "module-generation",
- "move-binary-format",
- "move-bytecode-verifier",
- "move-compiler",
- "move-core-types",
- "move-stdlib",
- "move-vm-runtime",
- "move-vm-test-utils",
- "move-vm-types",
- "num_cpus",
- "once_cell",
- "rand 0.8.5",
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.11.0"
@@ -5677,16 +5374,6 @@ dependencies = [
  "syn 2.0.60",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
 [[package]]
 name = "threadpool"
 version = "1.8.1"
@@ -5696,37 +5383,6 @@ dependencies = [
  "num_cpus",
 ]
 
-[[package]]
-name = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -5781,30 +5437,6 @@ dependencies = [
  "syn 2.0.60",
 ]
 
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "toml"
 version = "0.5.11"
@@ -5836,18 +5468,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f"
-dependencies = [
- "combine",
- "indexmap 1.9.3",
- "itertools 0.10.5",
- "serde",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.19.15"
@@ -5872,6 +5492,12 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "topological-sort"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -5908,7 +5534,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
- "valuable",
 ]
 
 [[package]]
@@ -5921,48 +5546,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-serde"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term 0.46.0",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-serde",
-]
-
 [[package]]
 name = "triehash"
 version = "0.8.4"
@@ -5989,6 +5572,26 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "try_match"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b065c869a3f832418e279aa4c1d7088f9d5d323bde15a60a08e20c2cd4549082"
+dependencies = [
+ "try_match_inner",
+]
+
+[[package]]
+name = "try_match_inner"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9c81686f7ab4065ccac3df7a910c4249f8c0f3fb70421d6ddec19b9311f63f9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
 [[package]]
 name = "tui"
 version = "0.19.0"
@@ -6144,7 +5747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna",
  "percent-encoding",
 ]
 
@@ -6154,12 +5757,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
 [[package]]
 name = "value-bag"
 version = "1.8.1"
@@ -6333,19 +5930,6 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
-[[package]]
-name = "wasm-streams"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "web-sys"
 version = "0.3.69"
@@ -6561,16 +6145,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "wyz"
 version = "0.2.0"
diff --git a/Cargo.toml b/Cargo.toml
index f50d4169b2..0592632843 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ members = [
     "language/evm/extract-ethereum-abi",
     "language/evm/move-ethereum-abi",
     "language/evm/move-to-yul",
-    "language/extensions/async/move-async-vm",
     "language/extensions/move-table-extension",
     "language/move-binary-format",
     "language/move-binary-format/serializer-tests",
@@ -54,7 +53,6 @@ members = [
     "language/move-vm/transactional-tests",
     "language/move-vm/types",
     "language/testing-infra/module-generation",
-    "language/testing-infra/test-generation",
     "language/testing-infra/transactional-test-runner",
     "language/tools/move-bytecode-utils",
     "language/tools/move-bytecode-viewer",
@@ -89,9 +87,21 @@ default-members = [
     "language/tools/move-unit-test",
 ]
 
+# All workspace members should inherit these keys
+# for package declarations.
+[workspace.package]
+authors = ["The Move Contributors"]
+edition = "2021"
+homepage = "https://github.com/move-language/move-on-aptos"
+license = "Apache-2.0"
+publish = false
+repository = "https://github.com/move-language/move-on-aptos"
+rust-version = "1.78.0"
+
 # Dependencies that should be kept in sync through the whole workspace
 [workspace.dependencies]
 atty = "0.2.14"
+ambassador = "0.4.1"
 anyhow = "1.0.71"
 arbitrary = { version = "1.3.2", features = ["derive"] }
 async-trait = "0.1.53"
@@ -116,6 +126,7 @@ crossbeam-channel = "0.5.4"
 crossterm = "0.26.1"
 dashmap = { version = "5.5.3", features = ["inline"] }
 datatest-stable = "0.1.1"
+dearbitrary = { version = "1.0.4", features = ["derive"] }
 derivative = "2.2.0"
 difference = "2.0.0"
 digest = "0.9.0"
@@ -140,6 +151,7 @@ hex-literal = "0.3.4"
 hkdf = "0.10.0"
 hostname = "0.3.1"
 httpmock = "0.6.8"
+im = "15.0.0"
 indexmap = "1.9.3"
 internment = { version = "0.5.0", features = ["arc"] }
 itertools = "0.12"
@@ -172,6 +184,7 @@ pretty = "0.10.0"
 pretty_assertions = "1.2.1"
 proc-macro2 = "1.0.38"
 project-root = "0.2.2"
+prometheus = { version = "0.13.3", default-features = false }
 proptest = "1.4.0"
 proptest-derive = "0.4.0"
 quote = "1.0.18"
@@ -233,7 +246,9 @@ tokio-stream = { version = "0.1.14", features = ["fs"] }
 tokio-test = "0.4.1"
 tokio-util = { version = "0.7.2", features = ["compat", "codec"] }
 toml = "0.7.4"
+topological-sort = "0.2.2"
 triomphe = "0.1.9"
+try_match = "0.4.2"
 tui = "0.19.0"
 typed-arena = "2.0.2"
 typenum = "1.17.0"
@@ -245,6 +260,51 @@ walkdir = "2.3.3"
 whoami = "1.5.0"
 z3tracer = "0.8.0"
 
+# MOVE DEPENDENCIES
+move-abigen = { path = "language/move-prover/move-abigen" }
+move-binary-format = { path = "language/move-binary-format" }
+move-borrow-graph = { path = "language/move-borrow-graph" }
+move-bytecode-source-map = { path = "language/move-ir-compiler/move-bytecode-source-map" }
+move-bytecode-spec = { path = "language/move-bytecode-spec" }
+move-bytecode-verifier = { path = "language/move-bytecode-verifier" }
+move-bytecode-verifier-invalid-mutations = { path = "language/move-bytecode-verifier/invalid-mutations" }
+move-bytecode-viewer = { path = "language/tools/move-bytecode-viewer" }
+move-bytecode-utils = { path = "language/tools/move-bytecode-utils" }
+move-cli = { path = "language/tools/move-cli" }
+move-command-line-common = { path = "language/move-command-line-common" }
+move-coverage = { path = "language/tools/move-coverage" }
+move-compiler = { path = "language/move-compiler" }
+move-compiler-v2 = { path = "language/move-compiler-v2" }
+move-core-types = { path = "language/move-core/types" }
+move-decompiler = { path = "language/tools/move-decompiler" }
+move-docgen = { path = "language/move-prover/move-docgen" }
+move-disassembler = { path = "language/tools/move-disassembler" }
+move-errmapgen = { path = "language/move-prover/move-errmapgen" }
+move-ir-types = { path = "language/move-ir/types" }
+move-ir-compiler = { path = "language/move-ir-compiler" }
+move-ir-to-bytecode = { path = "language/move-ir-compiler/move-ir-to-bytecode" }
+move-linter = { path = "language/tools/move-linter" }
+move-model = { path = "language/move-model" }
+move-package = { path = "language/tools/move-package" }
+move-prover = { path = "language/move-prover" }
+move-prover-boogie-backend = { path = "language/move-prover/boogie-backend" }
+move-prover-bytecode-pipeline = { path = "language/move-prover/bytecode-pipeline" }
+move-prover-test-utils = { path = "language/move-prover/test-utils" }
+move-prover-lab = { path = "language/move-prover/lab" }
+aptos-move-stdlib = { path = "aptos-move/framework/move-stdlib" }
+aptos-table-natives = { path = "aptos-move/framework/table-natives" }
+move-resource-viewer = { path = "language/tools/move-resource-viewer" }
+move-stackless-bytecode = { path = "language/move-model/bytecode" }
+move-stackless-bytecode-test-utils = { path = "language/move-model/bytecode-test-utils" }
+move-symbol-pool = { path = "language/move-symbol-pool" }
+move-table-extension = { path = "language/extensions/move-table-extension" }
+move-transactional-test-runner = { path = "language/testing-infra/transactional-test-runner" }
+move-unit-test = { path = "language/tools/move-unit-test", features = ["table-extension"] }
+move-vm-metrics = { path = "language/move-vm/metrics" }
+move-vm-runtime = { path = "language/move-vm/runtime" }
+move-vm-test-utils = { path = "language/move-vm/test-utils", features = ["table-extension"] }
+move-vm-types = { path = "language/move-vm/types" }
+
 [profile.bench]
 debug = true
 
diff --git a/clippy.toml b/clippy.toml
index f0b060c599..36f13055e2 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -6,3 +6,5 @@ type-complexity-threshold = 10000
 too-many-arguments-threshold = 14
 # Reasonably large enum variants are okay
 enum-variant-size-threshold = 1000
+# Allow unwrap in test
+allow-unwrap-in-tests = true
diff --git a/language/move-prover/src/cli.rs b/language/move-prover/src/cli.rs
index 2a2f0faa05..50d551a88f 100644
--- a/language/move-prover/src/cli.rs
+++ b/language/move-prover/src/cli.rs
@@ -804,16 +804,17 @@ impl Options {
         }
 
         if matches.get_flag("aptos") {
-            options.backend.custom_natives = Some(CustomNativeOptions {
-                template_bytes: include_bytes!(
-                    "../../../../aptos-move/framework/src/aptos-natives.bpl"
-                )
-                .to_vec(),
-                module_instance_names: options::custom_native_options(),
-            });
-            options
-                .move_named_address_values
-                .push("Extensions=0x1".to_string())
+            // TODO: re-enable
+            // options.backend.custom_natives = Some(CustomNativeOptions {
+            //     template_bytes: include_bytes!(
+            //         "../../../../aptos-move/framework/src/aptos-natives.bpl"
+            //     )
+            //     .to_vec(),
+            //     module_instance_names: options::custom_native_options(),
+            // });
+            // options
+            //     .move_named_address_values
+            //     .push("Extensions=0x1".to_string())
         }
         if matches.get_flag("compiler-v2") {
             options.compiler_v2 = true;
diff --git a/rust-toolchain b/rust-toolchain.toml
similarity index 63%
rename from rust-toolchain
rename to rust-toolchain.toml
index 8d6a21b0e8..c37a0463bc 100644
--- a/rust-toolchain
+++ b/rust-toolchain.toml
@@ -1,8 +1,8 @@
 [toolchain]
-channel = "1.75.0"
+channel = "1.78.0"
 
 # Note: we don't specify cargofmt in our toolchain because we rely on
 # the nightly version of cargofmt and verify formatting in CI/CD.
-components = [ "cargo", "clippy", "rustc", "rust-docs", "rust-std" ]
+components = ["cargo", "clippy", "rustc", "rust-docs", "rust-std"]
 
 
diff --git a/scripts/dev_setup.sh b/scripts/dev_setup.sh
index 919c20438c..c40637d0a2 100755
--- a/scripts/dev_setup.sh
+++ b/scripts/dev_setup.sh
@@ -355,16 +355,6 @@ function install_cvc5 {
   rm -rf "$TMPFILE"
 }
 
-function install_nodejs {
-  if [[ "$PACKAGE_MANAGER" == "apt-get" ]]; then
-    curl -fsSL https://deb.nodesource.com/setup_14.x | "${PRE_COMMAND[@]}" bash -
-    "${PRE_COMMAND[@]}" apt-get install -y nodejs
-  else
-    install_pkg nodejs "$PACKAGE_MANAGER"
-  fi
-  install_pkg npm "$PACKAGE_MANAGER"
-}
-
 function install_solidity {
   echo "Installing Solidity compiler"
   # We fetch the binary from  https://binaries.soliditylang.org
@@ -614,7 +604,6 @@ if [[ "$INSTALL_BUILD_TOOLS" == "true" ]]; then
   # We require nightly for stricter rust formatting
   install_toolchain nightly
   rustup component add rustfmt --toolchain nightly
-  install_nodejs "$PACKAGE_MANAGER"
 fi
 
 if [[ "$INSTALL_INDIVIDUAL" == "true" ]]; then